diff --git a/.gitignore b/.gitignore index 87c2918d902..e1915ef7ddc 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,7 @@ conf/docker-aio/dv/install/dvinstall.zip conf/docker-aio/testdata/ scripts/installer/default.config *.pem + +# do not track IntelliJ IDEA files +.idea +**/*.iml diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index f883e74982c..2c834088c1f 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -15,7 +15,7 @@ Welcome! New contributors should at least glance at [CONTRIBUTING.md](/CONTRIBUT - [ ] Merged latest from "develop" [branch][] and resolved conflicts [tests]: http://guides.dataverse.org/en/latest/developers/testing.html -[SQL updates]: https://github.com/IQSS/dataverse/tree/develop/scripts/database/upgrades +[SQL updates]: http://guides.dataverse.org/en/latest/developers/sql-upgrade-scripts.html [Solr updates]: https://github.com/IQSS/dataverse/blob/develop/conf/solr/7.3.0/schema.xml [docs]: http://guides.dataverse.org/en/latest/developers/documentation.html [branch]: http://guides.dataverse.org/en/latest/developers/branching-strategy.html diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile index 649fe74f673..ed73ab02d2a 100644 --- a/conf/docker-aio/c7.dockerfile +++ b/conf/docker-aio/c7.dockerfile @@ -3,7 +3,7 @@ FROM centos:7 RUN yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm #RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl httpd RUN yum install -y java-1.8.0-openjdk-devel postgresql96-server sudo epel-release unzip perl curl httpd -RUN yum install -y jq lsof +RUN yum install -y jq lsof awscli # copy and unpack dependencies (solr, glassfish) COPY dv /tmp/dv diff --git a/conf/docker-aio/readme.md b/conf/docker-aio/readme.md index 0338e3cd2de..2e27a4a3d64 100644 --- a/conf/docker-aio/readme.md +++ b/conf/docker-aio/readme.md @@ -57,4 +57,4 @@ There isn't any strict requirement on the local port (8083, 8084 in this doc), t * `empty reply from server` or `Failed to connect to ::1: Cannot assign requested address` tend to indicate either that you haven't given glassfish enough time to start, or your docker setup is in an inconsistent state and should probably be restarted. -* For manually fiddling around with the created dataverse, use user `dataverseAdmin` with password `admin`. +* For manually fiddling around with the created dataverse, use user `dataverseAdmin` with password `admin1`. diff --git a/conf/docker-aio/run-test-suite.sh b/conf/docker-aio/run-test-suite.sh index d6cfc65710b..fdd0b959a51 100755 --- a/conf/docker-aio/run-test-suite.sh +++ b/conf/docker-aio/run-test-suite.sh @@ -8,4 +8,4 @@ fi # Please note the "dataverse.test.baseurl" is set to run for "all-in-one" Docker environment. # TODO: Rather than hard-coding the list of "IT" classes here, add a profile to pom.xml. -mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT -Ddataverse.test.baseurl=$dvurl +mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT -Ddataverse.test.baseurl=$dvurl diff --git a/conf/docker-aio/testscripts/post b/conf/docker-aio/testscripts/post index 03eaf59fa34..0a9d4c43155 100755 --- a/conf/docker-aio/testscripts/post +++ b/conf/docker-aio/testscripts/post @@ -1,6 +1,6 @@ #/bin/sh cd scripts/api -./setup-all.sh --insecure | tee /tmp/setup-all.sh.out +./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out cd ../.. psql -U dvnapp dvndb -f scripts/database/reference_data.sql psql -U dvnapp dvndb -f doc/sphinx-guides/source/_static/util/pg8-createsequence-prep.sql diff --git a/conf/docker-dcm/0prep.sh b/conf/docker-dcm/0prep.sh index 01abf8f4c77..98cff3c805a 100755 --- a/conf/docker-dcm/0prep.sh +++ b/conf/docker-dcm/0prep.sh @@ -1,4 +1,3 @@ #!/bin/sh - -wget https://github.com/sbgrid/data-capture-module/releases/download/0.2/dcm-0.2-0.noarch.rpm +wget https://github.com/sbgrid/data-capture-module/releases/download/0.5/dcm-0.5-0.noarch.rpm diff --git a/conf/docker-dcm/dcmsrv.dockerfile b/conf/docker-dcm/dcmsrv.dockerfile index 04fe2e24769..4ec6fb86c06 100644 --- a/conf/docker-dcm/dcmsrv.dockerfile +++ b/conf/docker-dcm/dcmsrv.dockerfile @@ -1,13 +1,14 @@ # build from repo root FROM centos:6 RUN yum install -y epel-release -ARG RPMFILE=dcm-0.2-0.noarch.rpm +ARG RPMFILE=dcm-0.5-0.noarch.rpm COPY ${RPMFILE} /tmp/ COPY bashrc /root/.bashrc COPY test_install.sh /root/ RUN yum localinstall -y /tmp/${RPMFILE} RUN pip install -r /opt/dcm/requirements.txt RUN pip install awscli==1.15.75 +run export PATH=~/.local/bin:$PATH RUN /root/test_install.sh COPY rq-init-d /etc/init.d/rq RUN useradd glassfish diff --git a/conf/docker/solr/solrconfig_master.xml b/conf/docker/solr/solrconfig_master.xml index ee348b9d9f7..d409f70b5d5 100644 --- a/conf/docker/solr/solrconfig_master.xml +++ b/conf/docker/solr/solrconfig_master.xml @@ -686,13 +686,55 @@ of SearchComponents (see below) and supports distributed queries across multiple shards --> - + explicit 10 + edismax + 0.075 + + dvName^400 + authorName^180 + dvSubject^190 + dvDescription^180 + dvAffiliation^170 + title^130 + subject^120 + keyword^110 + topicClassValue^100 + dsDescriptionValue^90 + authorAffiliation^80 + publicationCitation^60 + producerName^50 + fileName^30 + fileDescription^30 + variableLabel^20 + variableName^10 + _text_^1.0 + + + dvName^200 + authorName^100 + dvSubject^100 + dvDescription^100 + dvAffiliation^100 + title^75 + subject^75 + keyword^75 + topicClassValue^75 + dsDescriptionValue^75 + authorAffiliation^75 + publicationCitation^75 + producerName^75 + + + + isHarvested:false^25000 + + @@ -924,27 +966,6 @@ true 10 5 - edismax - -dvName^170 -dvSubject^160 -dvDescription^150 -dvAffiliation^140 -title^130 -subject^120 -keyword^110 -topicClassValue^100 -dsDescriptionValue^90 -authorName^80 -authorAffiliation^70 -publicationCitation^60 -producerName^50 -fileName^40 -fileDescription^30 -variableLabel^20 -variableName^10 -text^1.0 - spellcheck diff --git a/conf/docker/solr/solrconfig_slave.xml b/conf/docker/solr/solrconfig_slave.xml index ac5e5124efb..c31710ebace 100644 --- a/conf/docker/solr/solrconfig_slave.xml +++ b/conf/docker/solr/solrconfig_slave.xml @@ -686,13 +686,55 @@ of SearchComponents (see below) and supports distributed queries across multiple shards --> - + explicit 10 + edismax + 0.075 + + dvName^400 + authorName^180 + dvSubject^190 + dvDescription^180 + dvAffiliation^170 + title^130 + subject^120 + keyword^110 + topicClassValue^100 + dsDescriptionValue^90 + authorAffiliation^80 + publicationCitation^60 + producerName^50 + fileName^30 + fileDescription^30 + variableLabel^20 + variableName^10 + _text_^1.0 + + + dvName^200 + authorName^100 + dvSubject^100 + dvDescription^100 + dvAffiliation^100 + title^75 + subject^75 + keyword^75 + topicClassValue^75 + dsDescriptionValue^75 + authorAffiliation^75 + publicationCitation^75 + producerName^75 + + + + isHarvested:false^25000 + + @@ -924,27 +966,6 @@ true 10 5 - edismax - -dvName^170 -dvSubject^160 -dvDescription^150 -dvAffiliation^140 -title^130 -subject^120 -keyword^110 -topicClassValue^100 -dsDescriptionValue^90 -authorName^80 -authorAffiliation^70 -publicationCitation^60 -producerName^50 -fileName^40 -fileDescription^30 -variableLabel^20 -variableName^10 -text^1.0 - spellcheck diff --git a/conf/solr/7.3.0/schema.xml b/conf/solr/7.3.0/schema.xml index 45a5255975d..9794ab9f152 100644 --- a/conf/solr/7.3.0/schema.xml +++ b/conf/solr/7.3.0/schema.xml @@ -147,11 +147,14 @@ + - + + + @@ -456,6 +459,7 @@ + + + isHarvested:false^25000 + + @@ -924,27 +966,6 @@ true 10 5 - edismax - -dvName^170 -dvSubject^160 -dvDescription^150 -dvAffiliation^140 -title^130 -subject^120 -keyword^110 -topicClassValue^100 -dsDescriptionValue^90 -authorName^80 -authorAffiliation^70 -publicationCitation^60 -producerName^50 -fileName^40 -fileDescription^30 -variableLabel^20 -variableName^10 -text^1.0 - spellcheck diff --git a/doc/release-notes/4690-custom-s3-url.md b/doc/release-notes/4690-custom-s3-url.md new file mode 100644 index 00000000000..b40fcdd5538 --- /dev/null +++ b/doc/release-notes/4690-custom-s3-url.md @@ -0,0 +1,2 @@ +Configuration options for custom S3 URLs of Amazon S3 compatible storage available. +See [configuration documentation](http://guides.dataverse.org/en/latest/installation/config.html#amazon-s3-storage-or-compatible) for details. diff --git a/doc/release-notes/4980-upgrades-across-versions.md b/doc/release-notes/4980-upgrades-across-versions.md new file mode 100644 index 00000000000..11f38c63b66 --- /dev/null +++ b/doc/release-notes/4980-upgrades-across-versions.md @@ -0,0 +1,10 @@ +We now offer an *EXPERIMENTAL* database upgrade method allowing users +to skip over a number of releases. E.g., it should be possible now to +upgrade a Dataverse database from v4.8.6 directly to v4.10, without +having to deploy the war files for the 5 releases between these 2 +versions and manually running the corresponding database upgrade +scripts. + +The upgrade script, dbupgrade.sh is provided in the scripts/database +directory of the Dataverse source tree. See the file +README_upgrade_across_versions.txt for the instructions. \ No newline at end of file diff --git a/doc/release-notes/5011-search-by-dataverse-alias.md b/doc/release-notes/5011-search-by-dataverse-alias.md new file mode 100644 index 00000000000..c4703cd49b1 --- /dev/null +++ b/doc/release-notes/5011-search-by-dataverse-alias.md @@ -0,0 +1 @@ +The Solr schema.xml file must be updated due to the addition of the "dvAlias" field. diff --git a/doc/release-notes/5323-saved-original-size b/doc/release-notes/5323-saved-original-size new file mode 100644 index 00000000000..ecc67f74540 --- /dev/null +++ b/doc/release-notes/5323-saved-original-size @@ -0,0 +1,15 @@ +Starting the release 4.10 the size of the saved original file (for an +ingested tabular datafile) is stored in the database. We provided the +following API that retrieve and permanently store the sizes for any +already existing saved originals: +/api/admin/datafiles/integrity/fixmissingoriginalsizes (see the +documentation note in the Native API guide, under "Datafile +Integrity"). + +While it's not strictly necessary to have these sizes in the database, +having them makes certain operations more efficient (primary example +is a user downloading the saved originals for multiple files/an entire +dataset etc.) Also, if present in the database, the size will be added +to the file information displayed in the output of the /api/datasets; +which can be useful for some users. + diff --git a/doc/release-notes/README.md b/doc/release-notes/README.md new file mode 100644 index 00000000000..8c2d5748034 --- /dev/null +++ b/doc/release-notes/README.md @@ -0,0 +1,12 @@ +# Dataverse Release Notes + +doc/sphinx-guides/source/developers/making-releases.rst documents the official process for making release notes but as indicated there, we are experimenting with a process with the following goals: + +- As a developer, I want to express in my pull request when an addition to the release notes will be necessary. +- As a developer, I want to be aware of changes that should be made to my dev environment after a pull request has been merged. I already know to look in `scripts/database/upgrades` if I pull the latest code from the "develop" branch for updates as described in doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst but I want a place to look for non-SQL updates that are required. These could be Solr schema changes or curl commands to reload metadata blocks, for example. + +# release-notes directory process + +- Create a Markdown file named after your branch (assuming your branch starts with an issue number as requested in doc/sphinx-guides/source/developers/version-control.rst) such as "5053-apis-custom-homepage.md". +- In the file you created, give instructions for non-SQL upgrade steps that must be taken to run the branch in your pull request. Examples include Solr schema updates or reloading metadata blocks. +- At release time, gather all the files into final release notes and make a `git rm` commit to delete them to prevent clutter. diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service index 8af5425cf0a..37c2107412a 100644 --- a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service +++ b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/glassfish.service @@ -3,13 +3,14 @@ Description = GlassFish Server v4.1 After = syslog.target network.target [Service] -User=glassfish +Type = forking ExecStart = /usr/bin/java -jar /usr/local/glassfish4/glassfish/lib/client/appserver-cli.jar start-domain ExecStop = /usr/bin/java -jar /usr/local/glassfish4/glassfish/lib/client/appserver-cli.jar stop-domain ExecReload = /usr/bin/java -jar /usr/local/glassfish4/glassfish/lib/client/appserver-cli.jar restart-domain +User=glassfish LimitNOFILE=32768 -DefaultTimeoutStartSec=120s # current default is 90s -Type = forking +Environment="LANG=en_US.UTF-8" +TimeoutStartSec=120s [Install] WantedBy = multi-user.target diff --git a/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html b/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html new file mode 100644 index 00000000000..f6230ccbc2b --- /dev/null +++ b/doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage-dynamic.html @@ -0,0 +1,222 @@ + + + + +
+
+
Deposit and share your data. Get academic credit.
+

Harvard Dataverse is a digital repository. Deposit data and code here.

+ + Add data to Harvard Dataverse + +
+
+
Organize datasets and gather metrics in your own virtual archive.
+

A dataverse is a virtual archive. A dataverse can contain dataverses, datasets, files and metadata.

+ + Create my own dataverse + +
+
+ +
+ + +
+ + +
+
Find data across research fields, preview metadata, and download files.
+
+
+
+ + + + +
+
+
+
+ + +
+
Browse by subject
+
+ +
+
+ + +
+

ALL SUBJECTS

+
+
+
+ + +
+
+
+
Datasets from journal articles
+ +
+ + +
Loading...
+ + +
+

ALL RECENT JOURNAL ACTIVITY

+
+
+ +
+
Datasets from research projects, groups and researchers
+ +
+ + +
Loading...
+ + +
+

ALL RECENT RESEARCHERS ACTIVITY

+
+
+
+
+
+ +
+ + +
+
+
Activity
+
+
+
+

All Files datasets added file downloads

+
+
+

Past 30 Days datasets added file downloads

+
+
+
+ +
+ + +
+
+
Looking for other online repositories at Harvard?
+

Harvard DASH central, open-access repository    Other data at Harvard

+
+
+ + diff --git a/doc/sphinx-guides/source/admin/dataverses-datasets.rst b/doc/sphinx-guides/source/admin/dataverses-datasets.rst index c9c476df7b5..92bc659b960 100644 --- a/doc/sphinx-guides/source/admin/dataverses-datasets.rst +++ b/doc/sphinx-guides/source/admin/dataverses-datasets.rst @@ -28,13 +28,20 @@ Removes a link between a dataverse and another dataverse. Only accessible to sup curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/dataverses/$linked-dataverse-alias/deleteLink/$linking-dataverse-alias +Add Dataverse RoleAssignments to Child Dataverses +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Recursively assigns the users and groups having a role(s),that are in the set configured to be inheritable via the :InheritParentRoleAssignments setting, on a specified dataverse to have the same role assignments on all of the dataverses that have been created within it. The response indicates success or failure and lists the individuals/groups and dataverses involved in the update. Only accessible to superusers. :: + + curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias//addRoleAssignmentsToChildren + Datasets -------- Move a Dataset ^^^^^^^^^^^^^^ -Moves a dataset whose id is passed to a dataverse whose alias is passed. If the moved dataset has a guestbook or a dataverse link that is not compatible with the destination dataverse, you will be informed and given the option to force the move and remove the guestbook or link. Only accessible to superusers. :: +Moves a dataset whose id is passed to a dataverse whose alias is passed. If the moved dataset has a guestbook or a dataverse link that is not compatible with the destination dataverse, you will be informed and given the option to force the move and remove the guestbook or link. Only accessible to users with permission to publish the dataset in the original and destination dataverse. :: curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$id/move/$alias @@ -58,3 +65,10 @@ Mint new PID for a Dataset Mints a new identifier for a dataset previously registered with a handle. Only accessible to superusers. :: curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/admin/$dataset-id/reregisterHDLToPID + +Send Dataset metadata to PID provider +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Forces update to metadata provided to the PID provider of a published dataset. Only accessible to superusers. :: + + curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$dataset-id/modifyRegistrationMetadata diff --git a/doc/sphinx-guides/source/admin/index.rst b/doc/sphinx-guides/source/admin/index.rst index cec018bef4d..542b392a9b5 100755 --- a/doc/sphinx-guides/source/admin/index.rst +++ b/doc/sphinx-guides/source/admin/index.rst @@ -25,6 +25,7 @@ This guide documents the functionality only available to superusers (such as "da solr-search-index ip-groups monitoring + reporting-tools maintenance backups troubleshooting diff --git a/doc/sphinx-guides/source/admin/metadatacustomization.rst b/doc/sphinx-guides/source/admin/metadatacustomization.rst index 1f99adf0334..66b9b02fc87 100644 --- a/doc/sphinx-guides/source/admin/metadatacustomization.rst +++ b/doc/sphinx-guides/source/admin/metadatacustomization.rst @@ -1,13 +1,17 @@ Metadata Customization -================================================= +====================== + +Dataverse has a flexible data-driven metadata system powered by "metadata blocks" that are listed in the :doc:`/user/appendix` section of the User Guide. In this section we explain the customization options. .. contents:: |toctitle| :local: -Purpose -------- +Introduction +------------ + +Before you embark on customizing metadata in Dataverse you should make sure you are aware of the modest amount of customization that is available with the Dataverse web interface. It's possible to hide fields and make field required by clicking "Edit" at the dataverse level, clicking "General Information" and making adjustments under "Metadata Fields" as described in the context of dataset templates in the :doc:`/user/dataverse-management` section of the User Guide. -Dataverse installers can customize the dataset-level metadata that Dataverse collects, including: +Much more customization of metadata is possible, but this is an advanced topic so feedback on what is written below is very welcome. The possibilities for customization include: - Editing and adding metadata fields @@ -16,29 +20,29 @@ Dataverse installers can customize the dataset-level metadata that Dataverse col - Editing and adding controlled vocabularies -- Changing which fields depositors must use in order to save datasets +- Changing which fields depositors must use in order to save datasets (see also "dataset templates" in the :doc:`/user/dataverse-management` section of the User Guide.) - Changing how saved metadata values are displayed in the UI -Background ----------- +Generally speaking it is safer to create your own custom metadata block rather than editing metadata blocks that ship with Dataverse, because changes to these blocks may be made in future releases of Dataverse. If you'd like to make improvements to any of the metadata blocks shipped with Dataverse, please open an issue at https://github.com/IQSS/dataverse/issues so it can be discussed before a pull request is made. Please note that the metadata blocks shipped with Dataverse are based on standards (e.g. DDI for social science) and you can learn more about these standards in the :doc:`/user/appendix` section of the User Guide. If you have developed your own custom metadata block that you think may be of interest to the Dataverse community, please create an issue and consider making a pull request as described in the :doc:`/developers/version-control` section of the Developer Guide. In Dataverse 4, custom metadata are no longer defined as individual -fields, as they were in Dataverse Network 3.x, but in metadata blocks. +fields, as they were in Dataverse Network (DVN) 3.x, but in metadata blocks. Dataverse 4 ships with a citation metadata block, which includes mandatory fields needed for assigning persistent IDs to datasets, and -domain specific metadata blocks. +domain specific metadata blocks. For a complete list, see the +:doc:`/user/appendix` section of the User Guide. -Definitions of these blocks are transmitted to a Dataverse instance in +Definitions of these blocks are loaded into a Dataverse installation in tab-separated value (TSV). [1]_\ :sup:`,`\ [2]_ While it is technically possible to define more than one metadata block in a TSV file, it is good organizational practice to define only one in each file. The metadata block TSVs shipped with Dataverse are in `this folder in the Dataverse github -repo `__. -Human-readable copies are maintained in `this Google Sheets -document `__. +repo `__ and the corresponding ResourceBundle property files are `here `__. +Human-readable copies are available in `this Google Sheets +document `__ but they tend to get out of sync with the TSV files, which should be considered authoritative. The Dataverse installation process operates on the TSVs, not the Google spreadsheet. About the metadata block TSV ---------------------------- @@ -100,9 +104,9 @@ Each of the three main sections own sets of properties: | | | blocks defined | | | | elsewhere. [4]_ | +-----------------------+-----------------------+-----------------------+ -| dataverseAlias | If specified, this | Free text | -| | metadata block will | | -| | be available only to | | +| dataverseAlias | If specified, this | Free text. For an | +| | metadata block will | example, see | +| | be available only to | custom_hbgdki.tsv. | | | the dataverse | | | | designated here by | | | | its alias and to | | @@ -179,15 +183,15 @@ Each of the three main sections own sets of properties: | | a prompt for what the | | | | user should enter. | | +-----------------------+-----------------------+------------------------+ -| fieldType | Defines the type of | | \• None | -| | content that the | | \• Date | -| | field, if not empty, | | \• Email | -| | is meant to contain. | | \• Text | -| | | | \• Textbox | -| | | | \• URL | -| | | | \• Int | -| | | | \• Float | -| | | | \• See Appendix_ for | +| fieldType | Defines the type of | | \• none | +| | content that the | | \• date | +| | field, if not empty, | | \• email | +| | is meant to contain. | | \• text | +| | | | \• textbox | +| | | | \• url | +| | | | \• int | +| | | | \• float | +| | | | \• See below for | | | | | fieldtype definitions| +-----------------------+-----------------------+------------------------+ | displayOrder | Controls the sequence | Non-negative integer. | @@ -196,7 +200,7 @@ Each of the three main sections own sets of properties: | | for input and | | | | presentation. | | +-----------------------+-----------------------+------------------------+ -| displayFormat | Controls how the | See Appendix_ for | +| displayFormat | Controls how the | See below for | | | content is displayed | displayFormat | | | for presentation (not | variables | | | entry). The value of | | @@ -264,8 +268,8 @@ Each of the three main sections own sets of properties: | | values that are | | | | likely to be unique. | | +-----------------------+-----------------------+------------------------+ -| displayOnCreate/showA\| Designate fields that | TRUE (display during | -| \boveFold [5]_ | should display during | creation) or FALSE | +| displayoncreate [5]_ | Designate fields that | TRUE (display during | +| | should display during | creation) or FALSE | | | the creation of a new | (don’t display during | | | dataset, even before | creation) | | | the dataset is saved. | | @@ -345,7 +349,7 @@ Each of the three main sections own sets of properties: | | this value is used as | | | | the identifier. | | +-----------------------+-----------------------+-----------------------+ -| Identifier | A string used to | Free text | +| identifier | A string used to | Free text | | | encode the selected | | | | enumerated value of a | | | | field. If this | | @@ -360,11 +364,6 @@ Each of the three main sections own sets of properties: | | for selection. | | +-----------------------+-----------------------+-----------------------+ -.. _Appendix: - -Appendix --------- - FieldType definitions ~~~~~~~~~~~~~~~~~~~~~ @@ -380,7 +379,8 @@ FieldType definitions | | resolutions of the form | | | YYYY-MM-DD, YYYY-MM, or YYYY. | +-----------------------------------+-----------------------------------+ -| email | A valid email address. | +| email | A valid email address. Not | +| | indexed for privacy reasons. | +-----------------------------------+-----------------------------------+ | text | Any text other than newlines may | | | be entered into this field. | @@ -481,6 +481,149 @@ These are common ways to use the displayFormat to control how values are display | | collection of NMR data. | +-----------------------------------+-----------------------------------+ +Metadata Block Setup +-------------------- + +Now that you understand the TSV format used for metadata blocks, the next step is to attempt to make improvements to existing metadata blocks or create entirely new metadata blocks. For either task, you should have a Dataverse environment set up for testing where you can drop the database frequently while you make edits to TSV files. Once you have tested your TSV files, you should consider making a pull request to contribute your improvement back to the community. + +Exploring Metadata Blocks +~~~~~~~~~~~~~~~~~~~~~~~~~ + +In addition to studying the TSV files themselves you might find the following highly experimental and subject-to-change API endpoints useful to understand the metadata blocks that have already been loaded into your installation of Dataverse: + +You can get a dump of metadata fields (yes, the output is odd, please open a issue) like this: + +``curl http://localhost:8080/api/admin/datasetfield`` + +To see details about an individual field such as "title" in the example below: + +``curl http://localhost:8080/api/admin/datasetfield/title`` + +Setting Up a Dev Environment for Testing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +You have several options for setting up a dev environment for testing metadata block changes: + +- Vagrant: See the :doc:`/developers/tools` section of the Dev Guide. +- docker-aio: See https://github.com/IQSS/dataverse/tree/develop/conf/docker-aio +- AWS deployment: See the :doc:`/developers/deployment` section of the Dev Guide. +- Full dev environment: See the :doc:`/developers/dev-environment` section of the Dev Guide. + +To get a clean environment in Vagrant, you'll be running ``vagrant destroy``. In Docker, you'll use ``docker rm``. For a full dev environment or AWS installation, you might find ``rebuild`` and related scripts at ``scripts/deploy/phoenix.dataverse.org`` useful. + +Editing TSV files +~~~~~~~~~~~~~~~~~ + +Early in Dataverse 4 development metadata blocks were edited in the Google spreadsheet mentioned above and then exported in TSV format. This worked fine when there was only one person editing the Google spreadsheet but now that contributions are coming in from all over, the TSV files are edited directly. We are somewhat painfully aware that another format such as XML might make more sense these days. Please see https://github.com/IQSS/dataverse/issues/4451 for a discussion of non-TSV formats. + +Please note that metadata fields share a common namespace so they must be unique. The following curl command will print list of metadata fields already available in the system: + +``curl http://localhost:8080/api/admin/index/solr/schema`` + +We'll use this command again below to update the Solr schema to accomodate metadata fields we've added. + +Loading TSV files into Dataverse +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +A number of TSV files are loaded into Dataverse on every new installation, becoming the metadata blocks you see in the UI. For the list of metadata blocks that are included with Dataverse out of the box, see the :doc:`/user/appendix` section of the User Guide. + +Along with TSV file, there are corresponding ResourceBundle property files with key=value pair `here `__. To add other language files, see the :doc:`/installation/config` for dataverse.lang.directory JVM Options section, and add a file, for example: "citation_lang.properties" to the path you specified for the ``dataverse.lang.directory`` JVM option, and then restart Glassfish. + +If you are improving an existing metadata block, the Dataverse installation process will load the TSV for you, assuming you edited the TSV file in place. The TSV file for the Citation metadata block, for example, can be found at ``scripts/api/data/metadatablocks/citation.tsv``. +If any of the below mentioned property values are changed, corresponsing ResourceBundle property file has to be edited and stored under ``dataverse.lang.directory`` location + +- name, displayName property under #metadataBlock +- name, title, description, watermark properties under #datasetfield +- DatasetField, Value property under #controlledVocabulary + +If you are creating a new custom metadata block (hopefully with the idea of contributing it back to the community if you feel like it would provide value to others), the Dataverse installation process won't know about your new TSV file so you must load it manually. The script that loads the TSV files into the system is ``scripts/api/setup-datasetfields.sh`` and contains a series of curl commands. Here's an example of the necessary curl command with the new custom metadata block in the "/tmp" directory. + +``curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file /tmp/new-metadata-block.tsv`` + +To create a new ResourceBundle, here are the steps to generate key=value pair for the three main sections: + +#metadataBlock properties +~~~~~~~~~~~~~~~~~~~~~~~~~ +metadatablock.name=(the value of **name** property from #metadatablock) + +metadatablock.displayName=(the value of **displayName** property from #metadatablock) + +example: + +metadatablock.name=citation + +metadatablock.displayName=Citation Metadata + +#datasetField (field) properties +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +datasetfieldtype.(the value of **name** property from #datasetField).title=(the value of **title** property from #datasetField) + +datasetfieldtype.(the value of **name** property from #datasetField).description=(the value of **description** property from #datasetField) + +datasetfieldtype.(the value of **name** property from #datasetField).watermark=(the value of **watermark** property from #datasetField) + +example: + +datasetfieldtype.title.title=Title + +datasetfieldtype.title.description=Full title by which the Dataset is known. + +datasetfieldtype.title.watermark=Enter title... + +#controlledVocabulary (enumerated) properties +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +controlledvocabulary.(the value of **DatasetField** property from #controlledVocabulary).(the value of **Value** property from #controlledVocabulary)=(the value of **Value** property from #controlledVocabulary) + +Since the **Value** property from #controlledVocabulary is free text, while creating the key, it has to be converted to lowercase, replace space with underscore, and strip accents. + +example: + +controlledvocabulary.subject.agricultural_sciences=Agricultural Sciences + +controlledvocabulary.language.marathi_(marathi)=Marathi (Mar\u0101\u1E6Dh\u012B) + + +Enabling a Metadata Block +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Running a curl command like "load" example above should make the new custom metadata block available within the system but in order to start using the fields you must either enable it from the GUI (see "General Information" in the :doc:`/user/dataverse-management` section of the User Guide) or by running a curl command like the one below using a superuser API token. In the example below we are enabling the "journal" and "geospatial" metadata blocks for the root dataverse: + +``curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" -d "[\"journal\",\"geospatial\"]" http://localhost:8080/api/dataverses/:root/metadatablocks`` + +Updating the Solr Schema +~~~~~~~~~~~~~~~~~~~~~~~~ + +Once you have enabled a new metadata block you should be able to see the new fields in the GUI but before you can save the dataset, you must add additional fields to your Solr schema. You should run the following curl command to have Dataverse output the "field name" and "copyField" elements for all the metadata fields that have been loaded into Dataverse: + +``curl http://localhost:8080/api/admin/index/solr/schema`` + +See the :doc:`/installation/prerequisites/` section of the Installation Guide for a suggested location on disk for the Solr schema file. + +Please note that if you are going to make a pull request updating ``conf/solr/7.3.0/schema.xml`` with fields you have added, you should first load all the custom metadata blocks in ``scripts/api/data/metadatablocks`` (including ones you don't care about) to create a complete list of fields. + +Reloading a Metadata Block +-------------------------- + +As mentioned above, changes to metadata blocks that ship with Dataverse will be made over time to improve them and release notes will sometimes instruct you to reload an existing metadata block. The syntax for reloading is the same as reloading. Here's an example with the "citation" metadata block: + +``curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file --upload-file citation.tsv`` + +Great care must be taken when reloading a metadata block. Matching is done on field names (or identifiers and then names in the case of controlled vocabulary values) so it's easy to accidentally create duplicate fields. + +The ability to reload metadata blocks means that SQL update scripts don't need to be written for these changes. See also the :doc:`/developers/sql-upgrade-scripts` section of the Dev Guide. + +Tips from the Dataverse Community +--------------------------------- + +If there are tips that you feel are omitted from this document, please open an issue at https://github.com/IQSS/dataverse/issues and consider making a pull request to make improvements. You can find this document at https://github.com/IQSS/dataverse/blob/develop/doc/sphinx-guides/source/admin/metadatacustomization.rst + +Alternatively, you are welcome to request "edit" access to this "Tips for Dataverse metadata blocks from the community" Google doc: https://docs.google.com/document/d/1XpblRw0v0SvV-Bq6njlN96WyHJ7tqG0WWejqBdl7hE0/edit?usp=sharing + +The thinking is that the tips can become issues and the issues can eventually be worked on as features to improve the Dataverse metadata system. + +Footnotes +--------- + .. [1] https://www.iana.org/assignments/media-types/text/tab-separated-values @@ -493,8 +636,10 @@ These are common ways to use the displayFormat to control how values are display .. [4] These field names are added to the Solr schema.xml and cannot be - duplicated. + duplicated. See "Editing TSV files" for how to check for duplication. .. [5] - Labeled “showabovefold” in Dataverse versions before 4.3.1 (see - `#3073 `__). + "displayoncreate" was "showabovefold" in Dataverse versions before 4.3.1 (see + `#3073 `__) but parsing is + done based on column order rather than name so this only matters to the + person reading the TSV file. diff --git a/doc/sphinx-guides/source/admin/metadataexport.rst b/doc/sphinx-guides/source/admin/metadataexport.rst index c6ebef0ce15..8efb100f003 100644 --- a/doc/sphinx-guides/source/admin/metadataexport.rst +++ b/doc/sphinx-guides/source/admin/metadataexport.rst @@ -34,3 +34,13 @@ Export Failures --------------- An export batch job, whether started via the API, or by the application timer, will leave a detailed log in your configured logs directory. This is the same location where your main Glassfish server.log is found. The name of the log file is ``export_[timestamp].log`` - for example, *export_2016-08-23T03-35-23.log*. The log will contain the numbers of datasets processed successfully and those for which metadata export failed, with some information on the failures detected. Please attach this log file if you need to contact Dataverse support about metadata export problems. + +Downloading Metadata via GUI +---------------------------- + +The :doc:`/user/dataset-management` section of the User Guide explains how end users can download the metadata formats above from the Dataverse GUI. + +Downloading Metadata via API +---------------------------- + +The :doc:`/api/native-api` section of the API Guide explains how end users can download the metadata formats above via API. diff --git a/doc/sphinx-guides/source/admin/reporting-tools.rst b/doc/sphinx-guides/source/admin/reporting-tools.rst new file mode 100644 index 00000000000..f3f5ad1623c --- /dev/null +++ b/doc/sphinx-guides/source/admin/reporting-tools.rst @@ -0,0 +1,16 @@ +.. role:: fixedwidthplain + +Reporting Tools +=============== + +Reporting tools created by members of the Dataverse community. + +.. contents:: Contents: + :local: + +* Matrix (): Collaboration Matrix is a visualization showing the connectedness and collaboration between authors and their affiliations. Visit https://rin.lipi.go.id/matrix/ to play with a production installation. + + +* Dataverse Web Report (): Creates interactive charts showing data extracted from the Dataverse Excel Report + +* Dataverse Reports for Texas Digital Library (): A python3-based tool to generate and email statistical reports from Dataverse (https://dataverse.org/) using the native API and database queries. diff --git a/doc/sphinx-guides/source/api/apps.rst b/doc/sphinx-guides/source/api/apps.rst index 29d75bb4e49..4487b267822 100755 --- a/doc/sphinx-guides/source/api/apps.rst +++ b/doc/sphinx-guides/source/api/apps.rst @@ -53,6 +53,14 @@ metrics.dataverse.org_ aggregates metrics across multiple Dataverse installation Java ---- +DVUploader +~~~~~~~~~~~~~~~~~~~~~ + +The open-source DVUploader tool is a stand-alone command-line Java application that uses the Dataverse API to upload files to a specified Dataset. Files can be specified by name, or the DVUploader can upload all files in a directory or recursively from a directory tree. The DVUploader can also verify that uploaded files match their local sources by comparing the local and remote fixity checksums. Source code, release 1.0.0- jar file, and documentation are available on GitHub. DVUploader's creation was supported by the Texas Digital Library. + +https://github.com/IQSS/dataverse-uploader + + Dataverse for Android ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/sphinx-guides/source/api/dataaccess.rst b/doc/sphinx-guides/source/api/dataaccess.rst index f06efa95288..3e3ad23b2c8 100755 --- a/doc/sphinx-guides/source/api/dataaccess.rst +++ b/doc/sphinx-guides/source/api/dataaccess.rst @@ -39,6 +39,18 @@ subset Column-wise subsetting. You must also supply a comma separated l --------------------------- +``noVarHeader`` + +(supported for tabular data files only; ignored for all other file types) + +============== =========== +Value Description +============== =========== +true|1 Tab-delimited data file, without the variable name header (added to tab. files by default) +============== =========== + +--------------------------- + ``imageThumb`` the following parameter values are supported (for image and pdf files only): @@ -187,3 +199,76 @@ Data Access API supports both session- and API key-based authentication. If a session is available, and it is already associated with an authenticated user, it will be used for access authorization. If not, or if the user in question is not authorized to access the requested object, an attempt will be made to authorize based on an API key, if supplied. All of the API verbs above support the key parameter ``key=...`` as well as the newer ``X-Dataverse-key`` header. For more details, see "Authentication" in the :doc:`intro` section. + +Access Requests and Processing +------------------------------ + +All of the following endpoints take the persistent identifier as a parameter in place of 'id'. + +Allow Access Requests: +~~~~~~~~~~~~~~~~~~~~~~ + +Allow or disallow users from requesting access to restricted files in a dataset where id is the database id of the dataset or pid is the persistent id (DOI or Handle) of the dataset to update. + +A curl example using an ``id``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d true http://$SERVER/api/access/{id}/allowAccessRequest + +A curl example using a ``pid``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X PUT -d true http://$SERVER/api/access/:persistentId/allowAccessRequest?persistentId={pid} + + +Request Access: +~~~~~~~~~~~~~~~ +``/api/access/datafile/$id/requestAccess`` + +This method requests access to the datafile whose id is passed on the behalf of an authenticated user whose key is passed. Note that not all datasets allow access requests to restricted files. + +A curl example using an ``id``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X PUT http://$SERVER/api/access/datafile/{id}/requestAccess + +Grant File Access: +~~~~~~~~~~~~~~~~~~ + +``/api/access/datafile/{id}/grantAccess/{identifier}`` + +This method grants access to the datafile whose id is passed on the behalf of an authenticated user whose user identifier is passed with an @ prefix. The key of a user who can manage permissions of the datafile is required to use this method. + +A curl example using an ``id``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X PUT http://$SERVER/api/access/datafile/{id}/grantAccess/{@userIdentifier} + +Reject File Access: +~~~~~~~~~~~~~~~~~~~ + +``/api/access/datafile/{id}/rejectAccess/{identifier}`` + +This method rejects the access request to the datafile whose id is passed on the behalf of an authenticated user whose user identifier is passed with an @ prefix. The key of a user who can manage permissions of the datafile is required to use this method. + +A curl example using an ``id``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X PUT http://$SERVER/api/access/datafile/{id}/rejectAccess/{@userIdentifier} + +Revoke File Access: +~~~~~~~~~~~~~~~~~~~ + +``/api/access/datafile/{id}/revokeAccess/{identifier}`` + +This method revokes previously granted access to the datafile whose id is passed on the behalf of an authenticated user whose user identifier is passed with an @ prefix. The key of a user who can manage permissions of the datafile is required to use this method. + +A curl example using an ``id``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X DELETE http://$SERVER/api/access/datafile/{id}/revokeAccess/{@userIdentifier} + +List File Access Requests: +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +``/api/access/datafile/{id}/listRequests`` + +This method returns a list of Authenticated Users who have requested access to the datafile whose id is passed. The key of a user who can manage permissions of the datafile is required to use this method. + +A curl example using an ``id``:: + + curl -H "X-Dataverse-key:$API_TOKEN" -X GET http://$SERVER/api/access/datafile/{id}/listRequests diff --git a/doc/sphinx-guides/source/api/intro.rst b/doc/sphinx-guides/source/api/intro.rst index a9543dff0a5..ecdcf78d3c7 100755 --- a/doc/sphinx-guides/source/api/intro.rst +++ b/doc/sphinx-guides/source/api/intro.rst @@ -9,12 +9,13 @@ We encourage anyone interested in building tools that interoperate with Datavers How This Guide is Organized --------------------------- -We document the Dataverse API in four sections: +We document the Dataverse API in five sections: - :doc:`sword`: For depositing data using a standards-based approach rather than the :doc:`native-api`. - :doc:`search`: For searching dataverses, datasets, and files. - :doc:`dataaccess`: For downloading and subsetting data. - :doc:`native-api`: For performing most tasks that are possible in the GUI. +- :doc:`metrics`: For query statisics about usage of a Dataverse installation. We use the term "native" to mean that the API is not based on any standard. For this reason, the :doc:`search` and :doc:`dataaccess` could also be considered "native" and in the future we may reorganize the API Guide to split the :doc:`native-api` section into "Datasets API", "Files" API, etc. diff --git a/doc/sphinx-guides/source/api/metrics.rst b/doc/sphinx-guides/source/api/metrics.rst index 7965c44fa22..821b74b0a96 100755 --- a/doc/sphinx-guides/source/api/metrics.rst +++ b/doc/sphinx-guides/source/api/metrics.rst @@ -4,52 +4,78 @@ Metrics API .. contents:: |toctitle| :local: -The Metrics API - .. note:: |CORS| The Metrics API can be used from scripts running in web browsers, as it allows cross-origin resource sharing (CORS). +.. note:: For all metrics `besides` Past Days Count (``/pastDays/$days``), Database setting ``MetricsCacheTimeoutMinutes`` defines how long the cached value will be returned by subsequent queries. + .. _CORS: https://www.w3.org/TR/cors/ -dataverses/toMonth ----------------------- +Total +----- + +Returns a count of various objects in dataverse over all-time:: + + GET https://$SERVER/api/info/metrics/$type + +``$type`` can be set to ``dataverses``, ``datasets``, ``files`` or ``downloads``. + +Example: ``curl https://demo.dataverse.org/api/info/metrics/downloads`` + +To-Month +-------- + +Returns a count of various objects in dataverse up to a specified month ``$YYYY-DD`` in YYYY-MM format (i.e. ``2018-01``):: + + GET https://$SERVER/api/info/metrics/$type/toMonth/$YYYY-DD + +``$type`` can be set to ``dataverses``, ``datasets``, ``files`` or ``downloads``. + +Example: ``curl https://demo.dataverse.org/api/info/metrics/dataverses/toMonth/2018-01`` + + +Past Days +--------- + +Returns a count of various objects in dataverse for the past ``$days`` (i.e. ``30``):: + + GET https://$SERVER/api/info/metrics/$type/pastDays/$days + +``$type`` can be set to ``dataverses``, ``datasets``, ``files`` or ``downloads``. -Returns a count up to the current month or append a date in YYYY-MM format (i.e. ``/2018-01``) for a specific month. +Example: ``curl https://demo.dataverse.org/api/info/metrics/datasets/pastDays/30`` -``curl https://demo.dataverse.org/api/info/metrics/dataverses/toMonth`` -datasets/toMonth ------------------------- +Dataverse Specific Commands +--------------------------- -Returns a count up to the current month or append a date in YYYY-MM format (i.e. ``/2018-01``) for a specific month. +By Subject +~~~~~~~~~~~~~~~ -``curl https://demo.dataverse.org/api/info/metrics/datasets/toMonth`` +Returns the number of dataverses by each subject:: -files/toMonth ------------------------- + GET https://$SERVER/api/info/metrics/dataverses/bySubject -Returns a count up to the current month or append a date in YYYY-MM format (i.e. ``/2018-01``) for a specific month. -``curl https://demo.dataverse.org/api/info/metrics/files/toMonth`` +By Category +~~~~~~~~~~~~~~~~~~~~~~ -downloads/toMonth ------------------------- +Returns the number of dataverses by each category:: -Returns a count up to the current month or append a date in YYYY-MM format (i.e. ``/2018-01``) for a specific month. + GET https://$SERVER/api/info/metrics/dataverses/byCategory -``curl https://demo.dataverse.org/api/info/metrics/downloads/toMonth`` -dataverses/byCategory ------------------------- +Dataset Specific Commands +------------------------- -``curl https://demo.dataverse.org/api/info/metrics/dataverses/byCategory`` +By Subject +~~~~~~~~~~~~~~~ -datasets/bySubject ------------------------- +Returns the number of datasets by each subject:: -``curl https://demo.dataverse.org/api/info/metrics/datasets/bySubject`` + GET https://$SERVER/api/info/metrics/datasets/bySubject .. |CORS| raw:: html CORS - + \ No newline at end of file diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst index c9cb01ce869..bc1b3439042 100644 --- a/doc/sphinx-guides/source/api/native-api.rst +++ b/doc/sphinx-guides/source/api/native-api.rst @@ -87,6 +87,17 @@ Create a New Role in a Dataverse Creates a new role under dataverse ``id``. Needs a json file with the role description:: POST http://$SERVER/api/dataverses/$id/roles?key=$apiKey + +POSTed JSON example:: + + { + "alias": "sys1", + "name": “Restricted System Role”, + "description": “A person who may only add datasets.”, + "permissions": [ + "AddDataset" + ] + } List Role Assignments in a Dataverse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -94,6 +105,16 @@ List Role Assignments in a Dataverse List all the role assignments at the given dataverse:: GET http://$SERVER/api/dataverses/$id/assignments?key=$apiKey + +Assign Default Role to User Creating a Dataset in a Dataverse +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Assign a default role to a user creating a dataset in a dataverse ``id`` where ``roleAlias`` is the database alias of the role to be assigned:: + + PUT http://$SERVER/api/dataverses/$id/defaultContributorRole/$roleAlias?key=$apiKey + +Note: You may use "none" as the ``roleAlias``. This will prevent a user who creates a dataset from having any role on that dataset. It is not recommended for dataverses with human contributors. + Assign a New Role on a Dataverse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -126,9 +147,9 @@ List Metadata Blocks Defined on a Dataverse Define Metadata Blocks for a Dataverse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Sets the metadata blocks of the dataverse. Makes the dataverse a metadatablock root. The query body is a JSON array with a list of metadatablocks identifiers (either id or name). :: +Sets the metadata blocks of the dataverse. Makes the dataverse a metadatablock root. The query body is a JSON array with a list of metadatablocks identifiers (either id or name), such as "journal" and "geospatial" in the example below. Requires "EditDataverse" permission. In this example the "root" dataverse is being modified but you can substitute any dataverse alias: - POST http://$SERVER/api/dataverses/$id/metadatablocks?key=$apiKey +``curl -H "X-Dataverse-key:$API_TOKEN" -X POST -H "Content-type:application/json" -d "[\"journal\",\"geospatial\"]" http://localhost:8080/api/dataverses/:root/metadatablocks`` Determine if a Dataverse Inherits Its Metadata Blocks from Its Parent ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -185,6 +206,27 @@ Before calling the API, make sure the data files referenced by the ``POST``\ ed * A Dataverse server can import datasets with a valid PID that uses a different protocol or authority than said server is configured for. However, the server will not update the PID metadata on subsequent update and publish actions. +Import a Dataset into a Dataverse with a DDI file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. note:: This action requires a Dataverse account with super-user permissions. + +To import a dataset with an existing persistent identifier (PID), you have to provide the PID as a parameter at the URL. The following line imports a dataset with the PID ``PERSISTENT_IDENTIFIER`` to Dataverse, and then releases it:: + + curl -H "X-Dataverse-key: $API_TOKEN" -X POST $SERVER_URL/api/dataverses/$DV_ALIAS/datasets/:importddi?pid=$PERSISTENT_IDENTIFIER&release=yes --upload-file ddi_dataset.xml + +The optional ``pid`` parameter holds a persistent identifier (such as a DOI or Handle). The import will fail if the provided PID fails validation. + +The optional ``release`` parameter tells Dataverse to immediately publish the dataset. If the parameter is changed to ``no``, the imported dataset will remain in ``DRAFT`` status. + +The file is a DDI xml file. + +.. warning:: + + * This API does not handle files related to the DDI file. + * A Dataverse server can import datasets with a valid PID that uses a different protocol or authority than said server is configured for. However, the server will not update the PID metadata on subsequent update and publish actions. + + Publish a Dataverse ~~~~~~~~~~~~~~~~~~~ @@ -252,6 +294,16 @@ Export Metadata of a Dataset in Various Formats .. note:: Supported exporters (export formats) are ``ddi``, ``oai_ddi``, ``dcterms``, ``oai_dc``, ``schema.org`` , and ``dataverse_json``. +Schema.org JSON-LD +^^^^^^^^^^^^^^^^^^ + +Please note that the ``schema.org`` format has changed in backwards-incompatible ways after Dataverse 4.9.4: + +- "description" was a single string and now it is an array of strings. +- "citation" was an array of strings and now it is an array of objects. + +Both forms are valid according to Google's Structured Data Testing Tool at https://search.google.com/structured-data/testing-tool . (This tool will report "The property affiliation is not recognized by Google for an object of type Thing" and this known issue is being tracked at https://github.com/IQSS/dataverse/issues/5029 .) Schema.org JSON-LD is an evolving standard that permits a great deal of flexibility. For example, https://schema.org/docs/gs.html#schemaorg_expected indicates that even when objects are expected, it's ok to just use text. As with all metadata export formats, we will try to keep the Schema.org JSON-LD format Dataverse emits backward-compatible to made integrations more stable, despite the flexibility that's afforded by the standard. + List Files in a Dataset ~~~~~~~~~~~~~~~~~~~~~~~ @@ -513,11 +565,11 @@ Dataset Locks To check if a dataset is locked:: - curl -H "$SERVER_URL/api/datasets/{database_id}/locks + curl "$SERVER_URL/api/datasets/{database_id}/locks Optionally, you can check if there's a lock of a specific type on the dataset:: - curl -H "$SERVER_URL/api/datasets/{database_id}/locks?type={lock_type} + curl "$SERVER_URL/api/datasets/{database_id}/locks?type={lock_type} Currently implemented lock types are ``Ingest, Workflow, InReview, DcmUpload and pidRegister``. @@ -720,6 +772,15 @@ Delete Provenance JSON for an uploaded file:: DELETE http://$SERVER/api/files/{id}/prov-json?key=$apiKey +Datafile Integrity +~~~~~~~~~~~~~~~~~~ + +Starting the release 4.10 the size of the saved original file (for an ingested tabular datafile) is stored in the database. The following API will retrieve and permanently store the sizes for any already existing saved originals:: + + GET http://$SERVER/api/admin/datafiles/integrity/fixmissingoriginalsizes{?limit=N} + +Note the optional "limit" parameter. Without it, the API will attempt to populate the sizes for all the saved originals that don't have them in the database yet. Otherwise it will do so for the first N such datafiles. + Builtin Users ------------- @@ -1274,3 +1335,12 @@ Clear a specific metric cache. Currently this must match the name of the row in CORS + +Inherit Dataverse Role Assignments +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Recursively applies the role assignments of the specified dataverse, for the roles specified by the ``:InheritParentRoleAssignments`` setting, to all dataverses contained within it:: + + GET http://$SERVER/api/admin/dataverse/{dataverse alias}/addRoleAssignmentsToChildren + +Note: setting ``:InheritParentRoleAssignments`` will automatically trigger inheritance of the parent dataverse's role assignments for a newly created dataverse. Hence this API call is intended as a way to update existing child dataverses or to update children after a change in role assignments has been made on a parent dataverse. diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst index bb8e268e698..b2b37e71425 100755 --- a/doc/sphinx-guides/source/api/search.rst +++ b/doc/sphinx-guides/source/api/search.rst @@ -6,7 +6,7 @@ Search API The Search API supports the same searching, sorting, and faceting operations as the Dataverse web interface. -Unlike the web interface, this new API is limited to *published* data until `issue 1299 `_ is resolved. +Unlike the web interface, this new API is limited to *published* data. The parameters and JSON response are partly inspired by the `GitHub Search API `_. @@ -26,7 +26,7 @@ Name Type Description =============== ======= =========== q string The search term or terms. Using "title:data" will search only the "title" field. "*" can be used as a wildcard either alone or adjacent to a term (i.e. "bird*"). For example, https://demo.dataverse.org/api/search?q=title:data type string Can be either "dataverse", "dataset", or "file". Multiple "type" parameters can be used to include multiple types (i.e. ``type=dataset&type=file``). If omitted, all types will be returned. For example, https://demo.dataverse.org/api/search?q=*&type=dataset -subtree string The identifier of the dataverse to which the search should be narrowed. The subtree of this dataverse and all its children will be searched. For example, https://demo.dataverse.org/api/search?q=data&subtree=birds +subtree string The identifier of the dataverse to which the search should be narrowed. The subtree of this dataverse and all its children will be searched. Multiple "subtree" parameters can be used to include multiple Dataverses. For example, https://demo.dataverse.org/api/search?q=data&subtree=birds&subtree=cats . sort string The sort field. Supported values include "name" and "date". See example under "order". order string The order in which to sort. Can either be "asc" or "desc". For example, https://demo.dataverse.org/api/search?q=data&sort=name&order=asc per_page int The number of results to return per request. The default is 10. The max is 1000. See :ref:`iteration example `. @@ -35,6 +35,7 @@ show_relevance boolean Whether or not to show details of which fields were ma show_facets boolean Whether or not to show facets that can be operated on by the "fq" parameter. False by default. See :ref:`advanced search example `. fq string A filter query on the search term. Multiple "fq" parameters can be used. See :ref:`advanced search example `. show_entity_ids boolean Whether or not to show the database IDs of the search results (for developer use). +query_entities boolean Whether entities are queried via direct database calls (for developer use). =============== ======= =========== Basic Search Example @@ -107,7 +108,7 @@ Advanced Search Example https://demo.dataverse.org/api/search?q=finch&show_relevance=true&show_facets=true&fq=publicationDate:2016&subtree=birds -In this example, ``show_relevance=true`` matches per field are shown. Available facets are shown with ``show_facets=true`` and of the facets is being used with ``fq=publication_date_s:2015``. The search is being narrowed to the dataverse with the identifier "birds" with the parameter ``subtree=birds``. +In this example, ``show_relevance=true`` matches per field are shown. Available facets are shown with ``show_facets=true`` and of the facets is being used with ``fq=publicationDate:2016``. The search is being narrowed to the dataverse with the identifier "birds" with the parameter ``subtree=birds``. .. code-block:: json diff --git a/doc/sphinx-guides/source/api/sword.rst b/doc/sphinx-guides/source/api/sword.rst index fc33bfca068..f940c4d37a5 100755 --- a/doc/sphinx-guides/source/api/sword.rst +++ b/doc/sphinx-guides/source/api/sword.rst @@ -11,7 +11,7 @@ About Introduced in Dataverse Network (DVN) `3.6 `_, the SWORD API was formerly known as the "Data Deposit API" and ``data-deposit/v1`` appeared in the URLs. For backwards compatibility these URLs continue to work (with deprecation warnings). Due to architectural changes and security improvements (especially the introduction of API tokens) in Dataverse 4.0, a few backward incompatible changes were necessarily introduced and for this reason the version has been increased to ``v1.1``. For details, see :ref:`incompatible`. -Dataverse implements most of SWORDv2_, which is specified at http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html . Please reference the `SWORDv2 specification`_ for expected HTTP status codes (i.e. 201, 204, 404, etc.), headers (i.e. "Location"), etc. For a quick introduction to SWORD, the two minute video at http://cottagelabs.com/news/intro-to-sword-2 is recommended. +Dataverse implements most of SWORDv2_, which is specified at http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html . Please reference the `SWORDv2 specification`_ for expected HTTP status codes (i.e. 201, 204, 404, etc.), headers (i.e. "Location"), etc. As a profile of AtomPub, XML is used throughout SWORD. As of Dataverse 4.0 datasets can also be created via JSON using the "native" API. SWORD is limited to the dozen or so fields listed below in the crosswalk, but the native API allows you to populate all metadata fields available in Dataverse. diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py index 291a01c6246..644ee1af3ef 100755 --- a/doc/sphinx-guides/source/conf.py +++ b/doc/sphinx-guides/source/conf.py @@ -40,7 +40,8 @@ 'sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.ifconfig', - 'sphinx.ext.viewcode' + 'sphinx.ext.viewcode', + 'sphinx.ext.graphviz' ] # Add any paths that contain templates here, relative to this directory. @@ -64,9 +65,9 @@ # built documents. # # The short X.Y version. -version = '4.9.4' +version = '4.10' # The full version, including alpha/beta/rc tags. -release = '4.9.4' +release = '4.10' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst index 90c49f5dd77..e0d0b4ffd25 100644 --- a/doc/sphinx-guides/source/developers/big-data-support.rst +++ b/doc/sphinx-guides/source/developers/big-data-support.rst @@ -18,14 +18,12 @@ Install a DCM Installation instructions can be found at https://github.com/sbgrid/data-capture-module . Note that a shared filesystem (posix or AWS S3) between Dataverse and your DCM is required. You cannot use a DCM with Swift at this point in time. -Please note that S3 support for DCM is highly experimental. Files can be uploaded to S3 but they cannot be downloaded until https://github.com/IQSS/dataverse/issues/4949 is worked on. If you want to play around with S3 support for DCM, you must configure a JVM option called ``dataverse.files.dcm-s3-bucket-name`` which is a holding area for uploaded files that have not yet passed checksum validation. Search for that JVM option at https://github.com/IQSS/dataverse/issues/4703 for commands on setting that JVM option and related setup. Note that because that GitHub issue has so many comments you will need to click "Load more" where it says "hidden items". FIXME: Document all of this properly. - -. FIXME: Explain what ``dataverse.files.dcm-s3-bucket-name`` is for and what it has to do with ``dataverse.files.s3-bucket-name``. +.. FIXME: Explain what ``dataverse.files.dcm-s3-bucket-name`` is for and what it has to do with ``dataverse.files.s3-bucket-name``. Once you have installed a DCM, you will need to configure two database settings on the Dataverse side. These settings are documented in the :doc:`/installation/config` section of the Installation Guide: - ``:DataCaptureModuleUrl`` should be set to the URL of a DCM you installed. -- ``:UploadMethods`` should be set to ``dcm/rsync+ssh``. +- ``:UploadMethods`` should include ``dcm/rsync+ssh``. This will allow your Dataverse installation to communicate with your DCM, so that Dataverse can download rsync scripts for your users. @@ -61,7 +59,6 @@ Steps to set up a DCM mock for Development Install Flask. - Download and run the mock. You will be cloning the https://github.com/sbgrid/data-capture-module repo. - ``git clone git://github.com/sbgrid/data-capture-module.git`` @@ -108,6 +105,123 @@ The following low level command should only be used when troubleshooting the "im ``curl -H "X-Dataverse-key: $API_TOKEN" -X POST "$DV_BASE_URL/api/batch/jobs/import/datasets/files/$DATASET_DB_ID?uploadFolder=$UPLOAD_FOLDER&totalSize=$TOTAL_SIZE"`` +Steps to set up a DCM via Docker for Development +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you need a fully operating DCM client for development purposes, these steps will guide you to setting one up. This includes steps to set up the DCM on S3 variant. + +Docker Image Set-up +^^^^^^^^^^^^^^^^^^^ + +- Install docker if you do not have it +- Follow these steps (extracted from ``docker-aio/readme.md`` & ``docker-dcm/readme.txt``) : + + - ``cd conf/docker-aio`` and run ``./0prep_deps.sh`` to create Glassfish and Solr tarballs in conf/docker-aio/dv/deps. + - Run ``./1prep.sh`` + - Build the docker image: ``docker build -t dv0 -f c7.dockerfile .`` + - ``cd ../docker-dcm`` and run ``./0prep.sh`` + - Build dcm/dv0dcm images with docker-compose: ``docker-compose -f docker-compose.yml build`` + - Start containers: ``docker-compose -f docker-compose.yml up -d`` + - Wait for container to show "healthy" (aka - ``docker ps``), then wait another 5 minutes (even though it shows healthy, glassfish is still standing itself up). Then run Dataverse app installation: ``docker exec -it dvsrv /opt/dv/install.bash`` + - Configure Dataverse application to use DCM (run from outside the container): ``docker exec -it dvsrv /opt/dv/configure_dcm.sh`` + - The Dataverse installation is accessible at ``http://localhost:8084``. + - You may need to change the DoiProvider inside dvsrv (ezid does not work): + + - ``curl -X DELETE -d EZID "localhost:8080/api/admin/settings/:DoiProvider"`` + - ``curl -X PUT -d DataCite "localhost:8080/api/admin/settings/:DoiProvider"`` + - Also change the doi.baseUrlString, doi.username, doi.password + +Optional steps for setting up the S3 Docker DCM Variant +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- Before: the default bucket for DCM to hold files in S3 is named test-dcm. It is coded into `post_upload_s3.bash` (line 30). Change to a different bucket if needed. +- Add AWS bucket info to dcmsrv + + - You need a credentials files in ~/.aws + + - ``mkdir ~/.aws`` + - ``yum install nano`` (or use a different editor below) + - ``nano ~/.aws/credentials`` and add these contents with your keys: + + - ``[default]`` + - ``aws_access_key_id =`` + - ``aws_secret_access_key =`` + +- Dataverse configuration (on dvsrv): + + - Set S3 as the storage driver + + - ``cd /opt/glassfish4/bin/`` + - ``./asadmin delete-jvm-options "\-Ddataverse.files.storage-driver-id=file"`` + - ``./asadmin create-jvm-options "\-Ddataverse.files.storage-driver-id=s3"`` + + - Add AWS bucket info to Dataverse + + - ``mkdir ~/.aws`` + - ``yum install nano`` (or use a different editor below) + - ``nano ~/.aws/credentials`` and add these contents with your keys: + + - ``[default]`` + - ``aws_access_key_id =`` + - ``aws_secret_access_key =`` + + - Also: ``nano ~/.aws/config`` to create a region file. Add these contents: + + - ``[default]`` + - ``region = us-east-1`` + + - Add the S3 bucket names to Dataverse + + - S3 bucket for Dataverse + + - ``/usr/local/glassfish4/glassfish/bin/asadmin create-jvm-options "-Ddataverse.files.s3-bucket-name=iqsstestdcmbucket"`` + + - S3 bucket for DCM (as Dataverse needs to do the copy over) + + - ``/usr/local/glassfish4/glassfish/bin/asadmin create-jvm-options "-Ddataverse.files.dcm-s3-bucket-name=test-dcm"`` + + - Set download method to be HTTP, as DCM downloads through S3 are over this protocol ``curl -X PUT "http://localhost:8080/api/admin/settings/:DownloadMethods" -d "native/http"`` + +Using the DCM Docker Containers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For using these commands, you will need to connect to the shell prompt inside various containers (e.g. ``docker exec -it dvsrv /bin/bash``) + +- Create a dataset and download rsync upload script +- Upload script to dcm_client (if needed, you can probably do all the actions for create/download inside dcm_client) + + - ``docker cp ~/Downloads/upload-FK2_NN49YM.bash dcm_client:/tmp`` + +- Create a folder of files to upload (files can be empty) +- Run script + + - e.g. ``bash ./upload-FK2_NN49YM.bash`` + +- Manually run post upload script on dcmsrv + + - for posix implementation: ``bash ./opt/dcm/scn/post_upload.bash`` + - for S3 implementation: ``bash ./opt/dcm/scn/post_upload_s3.bash`` + +Additional DCM docker development tips +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- You can completely blow away all the docker images with these commands (including non DCM ones!) + + - ``docker stop dvsrv`` + - ``docker stop dcm_client`` + - ``docker stop dcmsrv`` + - ``docker rm $(docker ps -a -q)`` + - ``docker rmi $(docker images -q)`` + +- There are a few logs to tail + + - dvsrv : ``tail -n 2000 -f /opt/glassfish4/glassfish/domains/domain1/logs/server.log`` + - dcmsrv : ``tail -n 2000 -f /var/log/lighttpd/breakage.log`` + - dcmsrv : ``tail -n 2000 -f /var/log/lighttpd/access.log`` + +- Note that by default the docker container will stop running if the process it is following is turned off. For example flask with dcmsrv. You can get around this by having the script being followed never close (e.g. sleep infinity) https://stackoverflow.com/questions/31870222/how-can-i-keep-container-running-on-kubernetes +- You may have to restart the glassfish domain occasionally to deal with memory filling up. If deployment is getting reallllllly slow, its a good time. + Repository Storage Abstraction Layer (RSAL) ------------------------------------------- @@ -155,7 +269,7 @@ In order to see the rsync URLs, you must run this command: ``curl -X PUT -d 'rsal/rsync' http://localhost:8080/api/admin/settings/:DownloadMethods`` -TODO: Document these in the Installation Guide once they're final. +.. TODO: Document these in the Installation Guide once they're final. To specify replication sites that appear in rsync URLs: @@ -221,7 +335,7 @@ Available Steps Dataverse has an internal step provider, whose id is ``:internal``. It offers the following steps: log -+++ +^^^ A step that writes data about the current workflow invocation to the instance log. It also writes the messages in its ``parameters`` map. @@ -238,7 +352,7 @@ A step that writes data about the current workflow invocation to the instance lo pause -+++++ +^^^^^ A step that pauses the workflow. The workflow is paused until a POST request is sent to ``/api/workflows/{invocation-id}``. @@ -251,7 +365,7 @@ A step that pauses the workflow. The workflow is paused until a POST request is http/sr -+++++++ +^^^^^^^ A step that sends a HTTP request to an external system, and then waits for a response. The response has to match a regular expression specified in the step parameters. The url, content type, and message body can use data from the workflow context, using a simple markup language. This step has specific parameters for rollback. diff --git a/doc/sphinx-guides/source/developers/dependencies.rst b/doc/sphinx-guides/source/developers/dependencies.rst new file mode 100644 index 00000000000..72fdad03e43 --- /dev/null +++ b/doc/sphinx-guides/source/developers/dependencies.rst @@ -0,0 +1,274 @@ +===================== +Dependency Management +===================== + +.. contents:: |toctitle| + :local: + +Dataverse is (currently) a Java EE 7 based application, that uses a lot of additional libraries for special purposes. +This includes features like support for SWORD-API, S3 storage and many others. + +Besides the code that glues together the single pieces, any developer needs to describe used dependencies for the +Maven-based build system. As is familiar to any Maven user, this happens inside the "Project Object Model" (POM) living in +``pom.xml`` at the root of the project repository. Recursive and convergent dependency resolution makes dependency +management with Maven very easy. But sometimes, in projects with many complex dependencies like Dataverse, you have +to help Maven make the right choices. + +Terms +----- + +As a developer, you should familiarize yourself with the following terms: + +- **Direct dependencies**: things *you use* yourself in your own code for Dataverse. +- **Transitive dependencies**: things *others use* for things you use, pulled in recursively. + See also: `Maven docs `_. + +.. graphviz:: + + digraph { + rankdir="LR"; + node [fontsize=10] + + yc [label="Your Code"] + da [label="Direct Dependency A"] + db [label="Direct Dependency B"] + ta [label="Transitive Dependency TA"] + tb [label="Transitive Dependency TB"] + tc [label="Transitive Dependency TC"] + dtz [label="Direct/Transitive Dependency Z"] + + yc -> da -> ta; + yc -> db -> tc; + da -> tb -> tc; + db -> dtz; + yc -> dtz; + } + +Direct dependencies +------------------- + +Within the POM, any direct dependencies reside within the ```` tag: + +.. code:: xml + + + + org.example + example + 1.1.0 + compile + + + + +Anytime you add a ````, Maven will try to fetch it from defined/configured repositories and use it +within the build lifecycle. You have to define a ````, but ```` is optional for ``compile``. +(See `Maven docs: Dep. Scope `_) + + +During fetching, Maven will analyse all transitive dependencies (see graph above) and, if necessary, fetch those, too. +Everything downloaded once is cached locally by default, so nothing needs to be fetched again and again, as long as the +dependency definition does not change. + +**Rules to follow:** + +1. You should only use direct dependencies for **things you are actually using** in your code. +2. **Clean up** direct dependencies no longer in use. It will bloat the deployment package otherwise! +3. Care about the **scope**. Do not include "testing only" dependencies in the package - it will hurt you in IDEs and bloat things. [#f1]_ +4. Avoid using different dependencies for the **same purpose**, e. g. different JSON parsing libraries. +5. Refactor your code to **use Java EE** standards as much as possible. +6. When you rely on big SDKs or similar big cool stuff, try to **include the smallest portion possible**. Complete SDK + bundles are typically heavyweight and most of the time unnecessary. +7. **Don't include transitive dependencies.** [#f2]_ + + * Exception: if you are relying on it in your code (see *Z* in the graph above), you must declare it. See below + for proper handling in these (rare) cases. + + +Transitive dependencies +----------------------- + +Maven is comfortable for developers; it handles recursive resolution, downloading, and adding "dependencies of dependencies". +However, as life is a box of chocolates, you might find yourself in *version conflict hell* sooner than later without even +knowing, but experiencing unintended side effects. + +When you look at the graph above, imagine *B* and *TB* rely on different *versions* of *TC*. How does Maven decide +which version it will include? Easy: the dependent version of the nearest version wins: + +.. graphviz:: + + digraph { + rankdir="LR"; + node [fontsize=10] + + yc [label="Your Code"] + db [label="Direct Dependency B"] + dtz1 [label="Z v1.0"] + dtz2 [label="Z v2.0"] + + yc -> db -> dtz1; + yc -> dtz2; + } + +In this case, version "2.0" will be included. If you know something about semantic versioning, a red alert should ring in your mind right now. +How do we know that *B* is compatible with *Z v2.0* when depending on *Z v1.0*? + +Another scenario getting us in trouble: indirect use of transitive dependencies. Imagine the following: we rely on *Z* +in our code, but do not include a direct dependency for it within the POM. Now *B* is updated and removed its dependency +on *Z*. You definitely don't want to head down that road. + +**Follow the rules to be safe:** + +1. Do **not use transitive deps implicit**: add a direct dependency for transitive deps you re-use in your code. +2. On every build check that no implicit usage was added by accident. +3. **Explicitly declare versions** of transitive dependencies in use by multiple direct dependencies. +4. On every build check that there are no convergence problems hiding in the shadows. +5. **Do special tests** on every build to verify these explicit combinations work. + +Managing transitive dependencies in ``pom.xml`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Maven can manage versions of transitive dependencies in four ways: + +1. Make a transitive-only dependency not used in your code a direct one and add a ```` tag. + Typically a bad idea, don't do that. +2. Use ```` or ```` tags on direct dependencies that request the transitive dependency. + *Last resort*, you really should avoid this. Not explained or used here. + `See Maven docs `_. +3. Explicitly declare the transitive dependency in ```` and add a ```` tag. +4. For more complex transitive dependencies, reuse a "Bill of Materials" (BOM) within ```` + and add a ```` tag. Many bigger and standard use projects provide those, making the POM much less bloated + compared to adding every bit yourself. + +A reduced example, only showing bits relevant to the above cases and usage of an explicit transitive dep directly: + +.. code-block:: xml + :linenos: + + + 1.11.172 + + 2.9.6 + 2.10.1 + + + + + + + + com.amazonaws + aws-java-sdk-bom + ${aws.version} + pom + import + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + import + pom + + + + joda-time + joda-time + ${joda.version} + + + + + + + + com.amazonaws + aws-java-sdk-s3 + + + + + com.fasterxml.jackson.core + jackson-core + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + +Helpful tools +-------------- + +Maven provides some plugins that are of great help to detect possible conflicts and implicit usage. + +For *implicit usage detection*, use `mvn dependency:analyze`. Examine the output with great care. Sometimes you will +see implicit usages that do no harm, especially if you are using bigger SDKs having some kind of `core` package. +This will also report on any direct dependency which is not in use and can be removed from the POM. Again, do this with +great caution and double check. + +If you want to see the dependencies both direct and transitive in a *dependency tree format*, use `mvn dependency:tree`. + +This will however not help you with detecting possible version conflicts. For this you need to use the `Enforcer Plugin +`_ with its built in `dependency convergence rule +`_. + +Repositories +------------ + +Maven receives all dependencies from *repositories*. Those can be public like `Maven Central `_ +and others, but you can also use a private repository on premises or in the cloud. Last but not least, you can use +local repositories, which can live next to your application code (see ``local_lib`` dir within Dataverse codebase). + +Repositories are defined within the Dataverse POM like this: + +.. code:: xml + + + + central-repo + Central Repository + http://repo1.maven.org/maven2 + default + + + prime-repo + PrimeFaces Maven Repository + http://repository.primefaces.org + default + + + dvn.private + Local repository for hosting jars not available from network repositories. + file://${project.basedir}/local_lib + + + +You can also add repositories to your local Maven settings, see `docs `_. + +Typically you will skip the addition of the central repository, but adding it to the POM has the benefit that +dependencies are first looked up there (which in theory can speed up downloads). You should keep in mind that repositories +are used in the order they appear. + +---- + +.. rubric:: Footnotes + +.. [#f1] Modern IDEs import your Maven POM and offer import autocompletion for classes based on direct dependencies in the model. You might end up using legacy or repackaged classes because of a wrong scope. +.. [#f2] This is going to bite back in modern IDEs when importing classes from transitive dependencies by "autocompletion accident". + +---- + +Previous: :doc:`documentation` | Next: :doc:`debugging` diff --git a/doc/sphinx-guides/source/developers/deployment.rst b/doc/sphinx-guides/source/developers/deployment.rst index 2e493165eb6..fdcb32afded 100755 --- a/doc/sphinx-guides/source/developers/deployment.rst +++ b/doc/sphinx-guides/source/developers/deployment.rst @@ -70,6 +70,24 @@ Then update the file and replace the values for "aws_access_key_id" and "aws_sec If you are having trouble configuring the files manually as described above, see https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html which documents the ``aws configure`` command. +Configure ~/.dataverse/ec2.env +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +In order to publish datasets you must configure a file at ``~/.dataverse/ec2.env`` and contact DataCite at support@datacite.org to ask for a test username and password. + +Create a ``.dataverse`` directory in your home directory like this: + +``mkdir ~/.dataverse`` + +Download :download:`ec2.env <../../../../scripts/installer/ec2.env>` and put it in the directory at ``~/.dataverse`` that you just created. From the command line, you can try the command below to move the file into place: + +``mv ~/Downloads/ec2.env ~/.dataverse`` + +Edit the file at ``~/.dataverse/ec2.env`` and fill in username and password from DataCite into the following fields: + +- dataverse_doi_username +- dataverse_doi_password + Download and Run the "Create Instance" Script ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/sphinx-guides/source/developers/dev-environment.rst b/doc/sphinx-guides/source/developers/dev-environment.rst index fc1d99fc289..9757ac5dd81 100755 --- a/doc/sphinx-guides/source/developers/dev-environment.rst +++ b/doc/sphinx-guides/source/developers/dev-environment.rst @@ -166,6 +166,13 @@ After the script has finished, you should be able to log into Dataverse with the - username: dataverseAdmin - password: admin +Configure Your Development Environment for Publishing +----------------------------------------------------- + +Run the following command: + +``curl http://localhost:8080/api/admin/settings/:DoiProvider -X PUT -d FAKE`` + Next Steps ---------- diff --git a/doc/sphinx-guides/source/developers/documentation.rst b/doc/sphinx-guides/source/developers/documentation.rst index fd70e2766a5..cd4894294ef 100755 --- a/doc/sphinx-guides/source/developers/documentation.rst +++ b/doc/sphinx-guides/source/developers/documentation.rst @@ -73,6 +73,28 @@ Every non-index page should use the following code to display a table of content This code should be placed below any introductory text/images and directly above the first subheading, much like a Wikipedia page. +Images +------ + +A good documentation is just like a website enhanced and upgraded by adding high quality and self-explanatory images. +Often images depict a lot of written text in a simple manner. Within our Sphinx docs, you can add them in two ways: a) add a +PNG image directly and include or b) use inline description languages like GraphViz (current only option). + +While PNGs in the git repo can be linked directly via URL, Sphinx-generated images do not need a manual step and might +provide higher visual quality. Especially in terms of quality of content, generated images can be extendend and improved +by a textbased and reviewable commit, without needing raw data or source files and no diff around. + +GraphViz based images +~~~~~~~~~~~~~~~~~~~~~ + +In some parts of the documentation, graphs are rendered as images via Sphinx GraphViz extension. + +This requires `GraphViz `_ installed and either ``dot`` on the path or +`adding options to the make call `_. + +This has been tested and works on Mac, Linux, and Windows. If you have not properly configured GraphViz, then the worst thing that might happen is a warning and missing images in your local documentation build. + + Versions -------- @@ -86,4 +108,4 @@ In order to make it clear to the crawlers that we only want the latest version d ---- -Previous: :doc:`testing` | Next: :doc:`debugging` +Previous: :doc:`testing` | Next: :doc:`dependencies` diff --git a/doc/sphinx-guides/source/developers/index.rst b/doc/sphinx-guides/source/developers/index.rst index fd7749df746..52bde9ee184 100755 --- a/doc/sphinx-guides/source/developers/index.rst +++ b/doc/sphinx-guides/source/developers/index.rst @@ -16,8 +16,10 @@ Developer Guide tips troubleshooting version-control + sql-upgrade-scripts testing documentation + dependencies debugging coding-style deployment diff --git a/doc/sphinx-guides/source/developers/intro.rst b/doc/sphinx-guides/source/developers/intro.rst index 2629d9c6db2..55746942c62 100755 --- a/doc/sphinx-guides/source/developers/intro.rst +++ b/doc/sphinx-guides/source/developers/intro.rst @@ -55,6 +55,7 @@ As a developer, you also may be interested in these projects related to Datavers - External Tools - add additional features to Dataverse: See the :doc:`/installation/external-tools` section of the Installation Guide. - Dataverse API client libraries - use Dataverse APIs from various languages: :doc:`/api/client-libraries` +- DVUploader - a stand-alone command-line Java application that uses the Dataverse API to support upload of files from local disk to a Dataset: https://github.com/IQSS/dataverse-uploader - Miniverse - expose metrics from a Dataverse database: https://github.com/IQSS/miniverse - Configuration management scripts - Ansible, Puppet, etc.: See "Advanced Installation" in the :doc:`/installation/prep` section of the Installation Guide. - :doc:`/developers/unf/index` (Java) - a Universal Numerical Fingerprint: https://github.com/IQSS/UNF @@ -62,6 +63,7 @@ As a developer, you also may be interested in these projects related to Datavers - `DataTags `_ (Java and Scala) - tag datasets with privacy levels: https://github.com/IQSS/DataTags - `TwoRavens `_ (Javascript) - a `d3.js `_ interface for exploring data and running Zelig models: https://github.com/IQSS/TwoRavens - `Zelig `_ (R) - run statistical models on files uploaded to Dataverse: https://github.com/IQSS/Zelig +- `Matrix `_ - a visualization showing the connectedness and collaboration between authors and their affiliations. - Third party apps - make use of Dataverse APIs: :doc:`/api/apps` - chat.dataverse.org - chat interface for Dataverse users and developers: https://github.com/IQSS/chat.dataverse.org - [Your project here] :) diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst index 6a77b2865b5..771b682385f 100755 --- a/doc/sphinx-guides/source/developers/making-releases.rst +++ b/doc/sphinx-guides/source/developers/making-releases.rst @@ -5,16 +5,49 @@ Making Releases .. contents:: |toctitle| :local: -Bump Version Numbers --------------------- +Use the number of the milestone with a "v" in front for the relase tag. For example: ``v4.6.2``. -Before tagging, ensure the version number has been incremented to the milestone (i.e. 4.6.2) in the following places: +Create the release GitHub issue and branch +------------------------------------------ + +Use the GitHub issue number and the release tag for the name of the branch. +For example: 4734-update-v-4.8.6-to-4.9 + +**Note:** the changes below must be the very last commits merged into the develop branch before it is merged into master and tagged for the release! + +Make the following changes in the release branch: + +1. Bump Version Numbers +======================= + +Increment the version number to the milestone (e.g. 4.6.2) in the following two files: - pom.xml -- doc/sphinx-guides/source/conf.py +- doc/sphinx-guides/source/conf.py (two places) + +Add the version being released to the lists in the following two files: + - doc/sphinx-guides/source/versions.rst +- scripts/database/releases.txt + +Here's an example commit where three of the four files above were updated at once: https://github.com/IQSS/dataverse/commit/99e23f96ec362ac2f524cb5cd80ca375fa13f196 + +2. Save the EJB Database Create Script +====================================== + +Save the script ``domains/domain1/generated/ejb/dataverse/dataverse_VDCNet-ejbPU_createDDL.jdbc`` created by EJB during the deployment of the release candidate. **Important:** add semicolons to the ends of the SQL commands in the EJB-generated file (see below)! Save the resulting file as ``scripts/database/create/create_v{VERSION_TAG}.sql`` using the version number tag for the release. For example: + +.. code-block:: none + + sed 's/$/;/' dataverse_VDCNet-ejbPU_createDDL.jdbc > scripts/database/create/create_v4.10.sql + +(We are saving the script above to support the new experimental process for updating the database across multiple versions; see ``scripts/database/README_upgrade_across_versions.txt`` for more information.) + +3. Check in the Changes Above... +================================ + +... into the release branch, make a pull request and merge the release branch into develop. -Here's an example commit where all three files were updated at once: https://github.com/IQSS/dataverse/commit/99e23f96ec362ac2f524cb5cd80ca375fa13f196 Merge "develop" into "master" ----------------------------- @@ -29,6 +62,8 @@ Create a draft release at https://github.com/IQSS/dataverse/releases/new - The "tag version" and "title" should be the number of the milestone with a "v" in front (i.e. v4.6.2). - For the description, follow previous examples at https://github.com/IQSS/dataverse/releases +Please note that the current process involves copying and pasting a running Google doc into release notes but we are conducting an experiment whereby developers can express the need for an addition to release notes by creating a file in ``/doc/release-notes`` containing the name of the issue they're working on. Perhaps the name of the branch could be used for the filename with ".md" appended (release notes are written in Markdown) such as ``5053-apis-custom-homepage.md``. To avoid accumulating many stale files over time, when a release is cut these files should probably be removed with ``git rm``. This experiment may help inform a future experiment having to do with improvements to our process for writing SQL upgrade scripts. See the :doc:`sql-upgrade-scripts` section for more on this topic. + Make Artifacts Available for Download ------------------------------------- @@ -36,7 +71,7 @@ Upload the following artifacts to the draft release you created: - war file (``mvn package`` from Jenkins) - installer (``cd scripts/installer && make``) -- database migration script +- database migration script (see also the :doc:`sql-upgrade-scripts` section) - other files as needed, such as an updated Solr schema Publish Release diff --git a/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst b/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst new file mode 100644 index 00000000000..d50ecc0d72e --- /dev/null +++ b/doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst @@ -0,0 +1,42 @@ +=================== +SQL Upgrade Scripts +=================== + +The database schema for Dataverse is constantly evolving. As other developers make changes to the database schema you will need to keep up with these changes to have your development environment in working order. Additionally, as you make changes to the database schema, you must write SQL upgrade scripts when needed and communicate with your fellow developers about applying those scripts. + +.. contents:: |toctitle| + :local: + +Location of SQL Upgrade Scripts +------------------------------- + +``scripts/database/upgrades`` is the directory where we keep or SQL upgrade scripts. + +How to Determine if You Need to Create or Update a SQL Upgrade Script +--------------------------------------------------------------------- + +If you are creating a new database table (which maps to an ``@Entity`` in JPA), you do not need to create or update a SQL upgrade script. The reason for this is that we use ``create-tables`` in ``src/main/resources/META-INF/persistence.xml`` so that new tables are automatically created by Glassfish when you deploy your war file. + +If you are doing anything other than creating a new database table such as adding a column to an existing table, you must create or update a SQL upgrade script. + +How to Create or Update a SQL Upgrade Script +-------------------------------------------- + +We assume you have already read the :doc:`version-control` section and have been keeping your feature branch up to date with the "develop" branch. + +First, check https://github.com/IQSS/dataverse/tree/develop/scripts/database/upgrades to see if a SQL upgrade script for the next release already exists. For example, if the current release is 4.9.4 and the next release will be 4.10, the script will be named ``upgrade_v4.9.4_to_v4.10.sql``. If the script exists, just add your changes to the bottom of it. + +If no SQL upgrade script exists, look at https://github.com/IQSS/dataverse/milestones to figure out the name of the next milestone and create a script using the naming convention above. + +As with any task related to Dataverse development, if you need any help writing SQL upgrade scripts, please reach out using any of the channels mentioned under "Getting Help" in the :doc:`intro` section. + +Please note that we are aware of the problem of merge conflicts in the SQL update script as well as how the next version number can change at any time. Please see the :doc:`making-releases` section for how we are running an experiment having to do with release notes that might help inform an improvement of our process for developing SQL upgrade scripts. + +Communicating the Need to Run SQL Updates +----------------------------------------- + +If you have made a pull request that contains SQL updates and that pull request is merged into the "develop" branch, you are responsible for communicating to other developers that when then pull the latest code from "develop" they must run your SQL updates. Post a message to the "dataverse-dev" mailing list at https://groups.google.com/forum/#!forum/dataverse-dev + +---- + +Previous: :doc:`version-control` | Next: :doc:`testing` diff --git a/doc/sphinx-guides/source/developers/testing.rst b/doc/sphinx-guides/source/developers/testing.rst index 50740618bfe..ac43d4111ff 100755 --- a/doc/sphinx-guides/source/developers/testing.rst +++ b/doc/sphinx-guides/source/developers/testing.rst @@ -290,4 +290,4 @@ Future Work on Load/Performance Testing ---- -Previous: :doc:`version-control` | Next: :doc:`documentation` +Previous: :doc:`sql-upgrade-scripts` | Next: :doc:`documentation` diff --git a/doc/sphinx-guides/source/developers/tips.rst b/doc/sphinx-guides/source/developers/tips.rst index 6cf5f9a45d3..da6121d74fc 100755 --- a/doc/sphinx-guides/source/developers/tips.rst +++ b/doc/sphinx-guides/source/developers/tips.rst @@ -79,7 +79,7 @@ For faster iteration while working on JSF pages, it is highly recommended that y Database Schema Exploration --------------------------- -With over 100 tables, the Dataverse PostgreSQL database ("dvndb") can be somewhat daunting for newcomers. Here are some tips for coming up to speed. +With over 100 tables, the Dataverse PostgreSQL database ("dvndb") can be somewhat daunting for newcomers. Here are some tips for coming up to speed. (See also the :doc:`sql-upgrade-scripts` section.) pgAdmin ~~~~~~~~ diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index 66562b83a9d..b6a81ad7676 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -145,4 +145,4 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl ---- -Previous: :doc:`troubleshooting` | Next: :doc:`testing` +Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts` diff --git a/doc/sphinx-guides/source/installation/advanced.rst b/doc/sphinx-guides/source/installation/advanced.rst index bf0d2c8a65e..acc2091b4fa 100644 --- a/doc/sphinx-guides/source/installation/advanced.rst +++ b/doc/sphinx-guides/source/installation/advanced.rst @@ -10,7 +10,11 @@ Advanced installations are not officially supported but here we are at least doc Multiple Glassfish Servers -------------------------- -The main thing to know about running multiple Glassfish servers is that only one can be the dedicated timer server, as explained in the :doc:`/admin/timers` section of the Admin Guide. +You should be conscious of the following when running multiple Glassfish servers. + +- Only one Glassfish server can be the dedicated timer server, as explained in the :doc:`/admin/timers` section of the Admin Guide. +- When users upload a logo for their dataverse using the "theme" feature described in the :doc:`/user/dataverse-management` section of the User Guide, these logos are stored only on the Glassfish server the user happend to be on when uploading the logo. By default these logos are written to the directory ``/usr/local/glassfish4/glassfish/domains/domain1/docroot/logos``. +- When a sitemp is created by a Glassfish server it is written to the filesystem of just that Glassfish server. By default the sitemap is written to the directory ``/usr/local/glassfish4/glassfish/domains/domain1/docroot/sitemap``. Detecting Which Glassfish Server a User Is On +++++++++++++++++++++++++++++++++++++++++++++ diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index e6b09ff1f25..61a16ecd95e 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -26,6 +26,8 @@ The :doc:`/api/native-api` contains a useful but potentially dangerous API endpo By default, all APIs can be operated on remotely and a number of endpoints do not require authentication. https://github.com/IQSS/dataverse/issues/1886 was opened to explore changing these defaults, but until then it is very important to block both the "admin" endpoint (and at least consider blocking ``builtin-users``). For details please see also the section on ``:BlockedApiPolicy`` below. +It's also possible to prevent file uploads via API by adjusting the ``:UploadMethods`` database setting. + Forcing HTTPS +++++++++++++ @@ -88,6 +90,12 @@ If you really don't want to front Glassfish with any proxy (not recommended), yo What about port 80? Even if you don't front Dataverse with Apache, you may want to let Apache run on port 80 just to rewrite HTTP to HTTPS as described above. You can use a similar command as above to change the HTTP port that Glassfish uses from 8080 to 80 (substitute ``http-listener-1.port=80``). Glassfish can be used to enforce HTTPS on its own without Apache, but configuring this is an exercise for the reader. Answers here may be helpful: http://stackoverflow.com/questions/25122025/glassfish-v4-java-7-port-unification-error-not-able-to-redirect-http-to +If you are running an installation with Apache and Glassfish on the same server, and would like to restrict Glassfish from responding to any requests to port 8080 from external hosts (in other words, not through Apache), you can restrict the AJP listener to localhost only with: + +``./asadmin set server-config.network-config.network-listeners.network-listener.http-listener-1.address=127.0.0.1`` + +You should **NOT** use the configuration option above if you are running in a load-balanced environment, or otherwise have the web server on a different host than the application server. + Root Dataverse Permissions -------------------------- @@ -116,7 +124,9 @@ Once you have your DOI or Handle account credentials and a namespace, configure Configuring Dataverse for DOIs ++++++++++++++++++++++++++++++ -Out of the box, Dataverse is configured for DOIs. Here are the configuration options for DOIs: +By default Dataverse attempts to register DOIs for each dataset and file under a test authority, though you must apply for your own credentials as explained above. + +Here are the configuration options for DOIs: **JVM Options:** @@ -132,6 +142,7 @@ Out of the box, Dataverse is configured for DOIs. Here are the configuration opt - :ref:`:Shoulder <:Shoulder>` - :ref:`:IdentifierGenerationStyle <:IdentifierGenerationStyle>` (optional) - :ref:`:DataFilePIDFormat <:DataFilePIDFormat>` (optional) +- :ref:`:FilePIDsEnabled <:FilePIDsEnabled>` (optional, defaults to true) Configuring Dataverse for Handles +++++++++++++++++++++++++++++++++ @@ -260,59 +271,142 @@ if your installation's :ref:`:PublicInstall` setting is true, or: You can configure this redirect properly in your cloud environment to generate a temporary URL for access to the Swift objects for computing. -Amazon S3 Storage -+++++++++++++++++ +Amazon S3 Storage (or Compatible) ++++++++++++++++++++++++++++++++++ -For institutions and organizations looking to use Amazon's S3 cloud storage for their installation, this can be set up manually through creation of the credentials and config files or automatically via the AWS console commands. +For institutions and organizations looking to use some kind of S3-based object storage for files uploaded to Dataverse, +this is entirely possible. You can either use Amazon Web Services or use some other, even on-site S3-compatible +storage (like Minio, Ceph RADOS S3 Gateway and many more). -You'll need an AWS account with an associated S3 bucket for your installation to use. From the S3 management console (e.g. ``_), you can poke around and get familiar with your bucket. We recommend using IAM (Identity and Access Management) to create a user with full S3 access and nothing more, for security reasons. See ``_ for more info on this process. +**Note:** The Dataverse Team is most familiar with AWS S3, and can provide support on its usage with Dataverse. Thanks to community contributions, the application's architecture also allows non-AWS S3 providers. The Dataverse Team can provide very limited support on these other providers. We recommend reaching out to the wider Dataverse community if you have questions. -Make note of the bucket's name and the region its data is hosted in. Dataverse and the AWS SDK make use of "AWS credentials profile file" and "AWS config profile file" located in ``~/.aws/`` where ``~`` is the home directory of the user you run Glassfish as. This file can be generated via either of two methods described below. It's also possible to use IAM Roles rather than the credentials file. Please note that in this case you will need anyway the config file to specify the region. +First: Set Up Accounts and Access Credentials +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Set Up credentials File Manually -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Dataverse and the AWS SDK make use of the "AWS credentials profile file" and "AWS config profile file" located in +``~/.aws/`` where ``~`` is the home directory of the user you run Glassfish as. This file can be generated via either +of two methods described below: -To create the ``credentials`` file manually, you will need to generate a key/secret key. The first step is to log onto your AWS web console (e.g. ``_). If you have created a user in AWS IAM, you can click on that user and generate the keys needed for Dataverse. +1. Manually through creation of the credentials and config files or +2. Automatically via the AWS console commands. -Once you have acquired the keys, they need to be added to the ``credentials`` file. The format for credentials is as follows: +Preparation When Using Amazon's S3 Service +########################################## -| ``[default]`` -| ``aws_access_key_id = `` -| ``aws_secret_access_key = `` +You'll need an AWS account with an associated S3 bucket for your installation to use. From the S3 management console +(e.g. ``_), you can poke around and get familiar with your bucket. -You must also specify the AWS region in the ``config`` file, for example: +**Make note** of the **bucket's name** and the **region** its data is hosted in. -| ``[default]`` -| ``region = us-east-1`` +To **create a user** with full S3 access and nothing more for security reasons, we recommend using IAM +(Identity and Access Management). See `IAM User Guide `_ +for more info on this process. -Place these two files in a folder named ``.aws`` under the home directory for the user running your Dataverse Glassfish instance. (From the `AWS Command Line Interface Documentation `_: "In order to separate credentials from less sensitive options, region and output format are stored in a separate file named config in the same folder") +**Generate the user keys** needed for Dataverse afterwards by clicking on the created user. +(You can skip this step when running on EC2, see below.) -Set Up Access Configuration Via Command Line Tools -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. TIP:: + If you are hosting Dataverse on an AWS EC2 instance alongside storage in S3, it is possible to use IAM Roles instead + of the credentials file (the file at ``~/.aws/credentials`` mentioned below). Please note that you will still need the + ``~/.aws/config`` file to specify the region. For more information on this option, see + http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html -Begin by installing the CLI tool `pip `_ to install the `AWS command line interface `_ if you don't have it. +Preparation When Using Custom S3-Compatible Service +################################################### -First, we'll get our access keys set up. If you already have your access keys configured, skip this step. From the command line, run: +We assume you have your S3-compatible custom storage in place, up and running, ready for service. -``pip install awscli`` +Please make note of the following details: -``aws configure`` +- **Endpoint URL** - consult the documentation of your service on how to find it. -You'll be prompted to enter your Access Key ID and secret key, which should be issued to your AWS account. The subsequent config steps after the access keys are up to you. For reference, the keys will be stored in ``~/.aws/credentials``, and your AWS access region in ``~/.aws/config``. + * Example: https://play.minio.io:9000 + +- **Region:** Optional, but some services might use it. Consult your service documentation. -Using an IAM Role with EC2 -^^^^^^^^^^^^^^^^^^^^^^^^^^ + * Example: *us-east-1* + +- **Access key ID and secret access key:** Usually you can generate access keys within the user profile of your service. -If you are hosting Dataverse on an AWS EC2 instance alongside storage in S3, it is possible to use IAM Roles instead of the credentials file (the file at ``~/.aws/credentials`` mentioned above). Please note that you will still need the ``~/.aws/config`` file to specify the region. For more information on this option, see http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html + * Example: + + - ID: *Q3AM3UQ867SPQQA43P2F* + + - Key: *zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG* + +- **Bucket name:** Dataverse will fail opening and uploading files on S3 if you don't create one. -Configure Dataverse to Use AWS/S3 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + * Example: *dataverse* -With your access to your bucket in place, we'll want to navigate to ``/usr/local/glassfish4/glassfish/bin/`` and execute the following ``asadmin`` commands to set up the proper JVM options. Recall that out of the box, Dataverse is configured to use local file storage. You'll need to delete the existing storage driver before setting the new one. -``./asadmin $ASADMIN_OPTS delete-jvm-options "\-Ddataverse.files.storage-driver-id=file"`` +Reported Working S3-Compatible Storage +###################################### + +`Minio v2018-09-12 `_ + Set ``dataverse.files.s3-path-style-access=true``, as Minio works path-based. Works pretty smooth, easy to setup. + **Can be used for quick testing, too:** just use the example values above. Uses the public (read: unsecure and + possibly slow) https://play.minio.io:9000 service. + + +**HINT:** If you are successfully using an S3 storage implementation not yet listed above, please feel free to +`open an issue at Github `_ and describe your setup. +We will be glad to add it here. + + +Manually Set Up Credentials File +################################ + +To create the ``~/.aws/credentials`` file manually, you will need to generate a key/secret key (see above). Once you have +acquired the keys, they need to be added to the ``credentials`` file. The format for credentials is as follows: + +:: + + [default] + aws_access_key_id = + aws_secret_access_key = + +While using Amazon's service, you must also specify the AWS region in the ``~/.aws/config`` file, for example: + +:: -``./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.files.storage-driver-id=s3"`` + [default] + region = us-east-1 + +Place these two files in a folder named ``.aws`` under the home directory for the user running your Dataverse Glassfish +instance. (From the `AWS Command Line Interface Documentation `_: +"In order to separate credentials from less sensitive options, region and output format are stored in a separate file +named config in the same folder") + +Console Commands to Set Up Access Configuration +############################################### + +Begin by installing the CLI tool `pip `_ to install the +`AWS command line interface `_ if you don't have it. + +First, we'll get our access keys set up. If you already have your access keys configured, skip this step. +From the command line, run: + +- ``pip install awscli`` +- ``aws configure`` + +You'll be prompted to enter your Access Key ID and secret key, which should be issued to your AWS account. +The subsequent config steps after the access keys are up to you. For reference, the keys will be stored in +``~/.aws/credentials``, and your AWS access region in ``~/.aws/config``. + +**TIP:** When using a custom S3 URL endpoint, you need to add it to every ``aws`` call: ``aws --endpoint-url s3 ...`` + (you may omit it while configuring). + +Second: Configure Dataverse to use S3 Storage +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +With access to your bucket in place, we'll want to navigate to ``/usr/local/glassfish4/glassfish/bin/`` +and execute the following ``asadmin`` commands to set up the proper JVM options. Recall that out of the box, Dataverse +is configured to use local file storage. You'll need to delete the existing storage driver before setting the new one. + +:: + + ./asadmin $ASADMIN_OPTS delete-jvm-options "-Ddataverse.files.storage-driver-id=file" + ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.files.storage-driver-id=s3" Then, we'll need to identify which S3 bucket we're using. Replace ``your_bucket_name`` with, of course, your bucket: @@ -324,10 +418,29 @@ Optionally, you can have users download files from S3 directly rather than havin If you enable ``dataverse.files.s3-download-redirect`` as described above, note that the S3 URLs expire after an hour by default but you can configure the expiration time using the ``dataverse.files.s3-url-expiration-minutes`` JVM option. Here's an example of setting the expiration time to 120 minutes: -``./asadmin create-jvm-options "-D dataverse.files.s3-url-expiration-minutes=120"`` +``./asadmin create-jvm-options "-Ddataverse.files.s3-url-expiration-minutes=120"`` + +In case you would like to configure Dataverse to use a custom S3 service instead of Amazon S3 services, please +add the options for the custom URL and region as documented below. Please read above if your desired combination has +been tested already and what other options have been set for a successful integration. Lastly, go ahead and restart your glassfish server. With Dataverse deployed and the site online, you should be able to upload datasets and data files and see the corresponding files in your S3 bucket. Within a bucket, the folder structure emulates that found in local file storage. +S3 Storage Options +################## + +========================================= ================== ================================================================== ============= +JVM Option Value Description Default value +========================================= ================== ================================================================== ============= +dataverse.files.storage-driver-id s3 Enable S3 storage driver. ``file`` +dataverse.files.s3-bucket-name The bucket name. See above. (none) +dataverse.files.s3-download-redirect ``true``/``false`` Enable direct download or proxy through Dataverse. ``false`` +dataverse.files.s3-url-expiration-minutes If direct downloads: time until links expire. Optional. 60 +dataverse.files.s3-custom-endpoint-url Use custom S3 endpoint. Needs URL either with or without protocol. (none) +dataverse.files.s3-custom-endpoint-region Only used when using custom endpoint. Optional. ``dataverse`` +dataverse.files.s3-path-style-access ``true``/``false`` Use path style buckets instead of subdomains. Optional. ``false`` +========================================= ================== ================================================================== ============= + .. _Branding Your Installation: Branding Your Installation @@ -358,7 +471,9 @@ Once you have the location of your custom homepage HTML file, run this curl comm ``curl -X PUT -d '/var/www/dataverse/branding/custom-homepage.html' http://localhost:8080/api/admin/settings/:HomePageCustomizationFile`` -Note that the ``custom-homepage.html`` file provided has a "Browse Data" button that assumes that your root dataverse still has an alias of "root". While you were branding your root dataverse, you may have changed the alias to "harvard" or "librascholar" or whatever and you should adjust the ``custom-homepage.html`` file as needed. +If you prefer to start with less of a blank slate, you can download the :download:`custom-homepage-dynamic.html ` template which was built for the Harvard Dataverse, and includes branding messaging, action buttons, search input, subject links, and recent dataset links. This page was built to utilize the :doc:`/api/metrics` to deliver dynamic content to the page via javascript. + +Note that the ``custom-homepage.html`` and ``custom-homepage-dynamic.html`` files provided have multiple elements that assume your root dataverse still has an alias of "root". While you were branding your root dataverse, you may have changed the alias to "harvard" or "librascholar" or whatever and you should adjust the custom homepage code as needed. For more background on what this curl command above is doing, see the "Database Settings" section below. If you decide you'd like to remove this setting, use the following curl command: @@ -423,6 +538,9 @@ Out of the box, Dataverse attempts to block search engines from crawling your in Letting Search Engines Crawl Your Installation ++++++++++++++++++++++++++++++++++++++++++++++ +Ensure robots.txt Is Not Blocking Search Engines +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + For a public production Dataverse installation, it is probably desired that search agents be able to index published pages (AKA - pages that are visible to an unauthenticated user). Polite crawlers usually respect the `Robots Exclusion Standard `_; we have provided an example of a production robots.txt :download:`here `). @@ -437,6 +555,25 @@ For more of an explanation of ``ProxyPassMatch`` see the :doc:`shibboleth` secti If you are not fronting Glassfish with Apache you'll need to prevent Glassfish from serving the robots.txt file embedded in the war file by overwriting robots.txt after the war file has been deployed. The downside of this technique is that you will have to remember to overwrite robots.txt in the "exploded" war file each time you deploy the war file, which probably means each time you upgrade to a new version of Dataverse. Furthermore, since the version of Dataverse is always incrementing and the version can be part of the file path, you will need to be conscious of where on disk you need to replace the file. For example, for Dataverse 4.6.1 the path to robots.txt may be ``/usr/local/glassfish4/glassfish/domains/domain1/applications/dataverse-4.6.1/robots.txt`` with the version number ``4.6.1`` as part of the path. +Creating a Sitemap and Submitting it to Search Engines +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Search engines have an easier time indexing content when you provide them a sitemap. The Dataverse sitemap includes URLs to all published dataverses and all published datasets that are not harvested or deaccessioned. + +Create or update your sitemap by adding the following curl command to cron to run nightly or as you see fit: + +``curl -X POST http://localhost:8080/api/admin/sitemap`` + +This will create or update a file in the following location unless you have customized your installation directory for Glassfish: + +``/usr/local/glassfish4/glassfish/domains/domain1/docroot/sitemap/sitemap.xml`` + +On an installation of Dataverse with many datasets, the creation or updating of the sitemap can take a while. You can check Glassfish's server.log file for "BEGIN updateSiteMap" and "END updateSiteMap" lines to know when the process started and stopped and any errors in between. + +https://demo.dataverse.org/sitemap.xml is the sitemap URL for the Dataverse Demo site and yours should be similar. Submit your sitemap URL to Google by following `Google's "submit a sitemap" instructions`_ or similar instructions for other search engines. + +.. _Google's "submit a sitemap" instructions: https://support.google.com/webmasters/answer/183668 + Putting Your Dataverse Installation on the Map at dataverse.org +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -525,7 +662,7 @@ Configuration for :doc:`r-rapache-tworavens`. dataverse.dropbox.key +++++++++++++++++++++ -Dropbox provides a Chooser app, which is a Javascript component that allows you to upload files to Dataverse from Dropbox. It is an optional configuration setting, which requires you to pass it an app key. For more information on setting up your Chooser app, visit https://www.dropbox.com/developers/chooser. +Dropbox provides a Chooser app, which is a Javascript component that allows you to upload files to Dataverse from Dropbox. It is an optional configuration setting, which requires you to pass it an app key and configure the ``:UploadMethods`` database setting. For more information on setting up your Chooser app, visit https://www.dropbox.com/developers/chooser. ``./asadmin create-jvm-options "-Ddataverse.dropbox.key={{YOUR_APP_KEY}}"`` @@ -629,6 +766,19 @@ This JVM option is used to configure the path where all the language specific pr If this value is not set, by default, a Dataverse installation will read the English language property files from the Java Application. +dataverse.files.hide-schema-dot-org-download-urls ++++++++++++++++++++++++++++++++++++++++++++++++++ + +Please note that this setting is experimental. + +By default, download URLs to files will be included in Schema.org JSON-LD output. To prevent these URLs from being included in the output, set ``dataverse.files.hide-schema-dot-org-download-urls`` to true as in the example below. + +``./asadmin create-jvm-options '-Ddataverse.files.hide-schema-dot-org-download-urls=true'`` + +Please note that there are other reasons why download URLs may not be included for certain files such as if a guestbook entry is required or if the file is restricted. + +For more on Schema.org JSON-LD, see the :doc:`/admin/metadataexport` section of the Admin Guide. + Database Settings ----------------- @@ -734,7 +884,7 @@ By default the footer says "Copyright © [YYYY]" but you can add text after the :DoiProvider ++++++++++++ -As of this writing "DataCite" and "EZID" are the only valid options. ``:DoiProvider`` is only needed if you are using DOI. +As of this writing "DataCite" and "EZID" are the only valid options for production installations. Developers are welcome to use "FAKE". ``:DoiProvider`` is only needed if you are using DOI. ``curl -X PUT -d DataCite http://localhost:8080/api/admin/settings/:DoiProvider`` @@ -825,12 +975,18 @@ Otherwise, if ``:DataFilePIDFormat`` is set to *INDEPENDENT*, then each file wil Note that in either case, when using the ``sequentialNumber`` option, datasets and files share the same database sequence that was created as part of the setup described in ``:IdentifierGenerationStyle`` above. +.. _:FilePIDsEnabled: + :FilePIDsEnabled ++++++++++++++++ -Enable/disable the publishing of file based PIDs for the whole installation. This is enabled by default +Toggles publishing of file-based PIDs for the entire installation. By default this setting is absent and Dataverse assumes it to be true. + +If you don't want to register file-based PIDs for your installation, set: -``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:FilePIDsEnabled`` +``curl -X PUT -d 'false' http://localhost:8080/api/admin/settings/:FilePIDsEnabled`` + +Note: File-level PID registration was added in 4.9 and is required until version 4.9.3. :ApplicationTermsOfUse ++++++++++++++++++++++ @@ -908,7 +1064,7 @@ Make the metrics component on the root dataverse a clickable link to a website w :StatusMessageHeader ++++++++++++++++++++ -For dynamically adding information to the top of every page. For example, "For testing only..." at the top of https://demo.dataverse.org is set with this: +For dynamically adding an informational header to the top of every page. StatusMessageText must also be set for a message to show. For example, "For testing only..." at the top of https://demo.dataverse.org is set with this: ``curl -X PUT -d "For testing only..." http://localhost:8080/api/admin/settings/:StatusMessageHeader`` @@ -917,7 +1073,7 @@ You can make the text clickable and include an additional message in a pop up by :StatusMessageText ++++++++++++++++++ -After you've set ``:StatusMessageHeader`` you can also make it clickable to have it include text if a popup with this: +Alongside the ``:StatusMessageHeader`` you need to add StatusMessageText for the message to show.: ``curl -X PUT -d "This appears in a popup." http://localhost:8080/api/admin/settings/:StatusMessageText`` @@ -984,6 +1140,20 @@ By default Dataverse will attempt to connect to Solr on port 8983 on localhost. ``curl -X PUT -d localhost:8983 http://localhost:8080/api/admin/settings/:SolrHostColonPort`` +:SolrFullTextIndexing ++++++++++++++++++++++ + +Whether or not to index the content of files such as PDFs. The default is false. + +``curl -X PUT -d true http://localhost:8080/api/admin/settings/:SolrFullTextIndexing`` + +:SolrMaxFileSizeForFullTextIndexing ++++++++++++++++++++++++++++++++++++ + +If ``:SolrFullTextIndexing`` is set to true, the content of files of any size will be indexed. To set a limit in bytes for which files to index in this way: + +``curl -X PUT -d 314572800 http://localhost:8080/api/admin/settings/:SolrMaxFileSizeForFullTextIndexing`` + :SignUpUrl ++++++++++ @@ -1022,6 +1192,10 @@ Set custom text a user will view when publishing a dataset. Note that this text ``curl -X PUT -d "Deposit License Requirements" http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomText`` +If you have a long text string, you can upload it as a file as in the example below. + +``curl -X PUT --upload-file /tmp/long.txt http://localhost:8080/api/admin/settings/:DatasetPublishPopupCustomText`` + :DatasetPublishPopupCustomTextOnAllVersions +++++++++++++++++++++++++++++++++++++++++++ @@ -1275,9 +1449,18 @@ The URL for your Repository Storage Abstraction Layer (RSAL) installation. This :UploadMethods ++++++++++++++ -This setting is experimental and to be used with the Data Capture Module (DCM). For now, if you set the upload methods to ``dcm/rsync+ssh`` it will allow your users to download rsync scripts from the DCM. +This setting controls which upload methods are available to users of your installation of Dataverse. The following upload methods are available: -``curl -X PUT -d 'dcm/rsync+ssh' http://localhost:8080/api/admin/settings/:UploadMethods`` +- ``native/http``: Corresponds to "Upload with HTTP via your browser" and APIs that use HTTP (SWORD and native). +- ``dcm/rsync+ssh``: Corresponds to "Upload with rsync+ssh via Data Capture Module (DCM)". A lot of setup is required, as explained in the :doc:`/developers/big-data-support` section of the Dev Guide. + +Out of the box only ``native/http`` is enabled and will work without further configuration. To add multiple upload method, separate them using a comma like this: + +``curl -X PUT -d 'native/http,dcm/rsync+ssh' http://localhost:8080/api/admin/settings/:UploadMethods`` + +You'll always want at least one upload method, so the easiest way to remove one of them is to simply ``PUT`` just the one you want, like this: + +``curl -X PUT -d 'native/http' http://localhost:8080/api/admin/settings/:UploadMethods`` :DownloadMethods ++++++++++++++++ @@ -1319,7 +1502,7 @@ Enable the collection of provenance metadata on Dataverse via the provenance pop :MetricsCacheTimeoutMinutes +++++++++++++++++++++++++++ -Sets how long a cached metrics result is used before re-running the query for a request. Note this only effects queries on the current month, previous months queries are cached indefinitely. The default timeout is 7 days (10080 minutes). +Sets how long a cached metrics result is used before re-running the query for a request. This timeout is only applied to some of the metrics that query the current state of the system, previous months queries are cached indefinitely. See :doc:`/api/metrics` for more info. The default timeout value is 7 days (10080 minutes). ``curl -X PUT -d 10080 http://localhost:8080/api/admin/settings/:MetricsCacheTimeoutMinutes`` @@ -1330,3 +1513,14 @@ Sets which languages should be available. If there is more than one, a dropdown in the header. This should be formated as a JSON array as shown below. ``curl http://localhost:8080/api/admin/settings/:Languages -X PUT -d '[{ "locale":"en", "title":"English"}, { "locale":"fr", "title":"Français"}]'`` + +:InheritParentRoleAssignments ++++++++++++++++++++++++++++++ + +``:InheritParentRoleAssignments`` can be set to a comma-separated list of role aliases or '*' (all) to cause newly created Dataverses to inherit the set of users and/or internal groups who have assignments for those role(s) on the parent Dataverse, i.e. those users/groups will be assigned the same role(s) on the new Dataverse (in addition to the creator of the new Dataverse having an admin role). +This can be helpful in situations where multiple organizations are sharing one Dataverse instance. The default, if ``::InheritParentRoleAssignments`` is not set is for the creator of the new Dataverse to be the only one assigned a role. + +``curl -X PUT -d 'admin, curator' http://localhost:8080/api/admin/settings/:InheritParentRoleAssignments`` +or +``curl -X PUT -d '*' http://localhost:8080/api/admin/settings/:InheritParentRoleAssignments`` + diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index eda0f293e85..06b41e9e7d3 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -114,7 +114,7 @@ It is not necessary for Glassfish to be running before you execute the Dataverse Please note that you must run Glassfish in an English locale. If you are using something like ``LANG=de_DE.UTF-8``, ingest of tabular data will fail with the message "RoundRoutines:decimal separator no in right place". -Also note that Glassfish may utilize more than the default number of file descriptors, especially when running batch jobs such as harvesting. We have increased ours by adding ulimit -n 32768 to our glassfish init script. On operating systems which use systemd such as RHEL or CentOS 7, file descriptor limits may be increased by adding a line like LimitNOFILE=32768 to the systemd unit file. You may adjust the file descriptor limits on running processes by using the prlimit utility: +Also note that Glassfish may utilize more than the default number of file descriptors, especially when running batch jobs such as harvesting. We have increased ours by adding ulimit -n 32768 to our glassfish init script. On operating systems which use systemd such as RHEL or CentOS 7, file descriptor limits may be increased by adding a line like LimitNOFILE=32768 to the systemd unit file. You may adjust the file descriptor limits on running processes by using the prlimit utility:: # sudo prlimit --pid pid --nofile=32768:32768 @@ -212,20 +212,29 @@ You should already have a "dvinstall.zip" file that you downloaded from https:// cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-7.3.0/server/solr/collection1/conf cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.3.0/server/solr/collection1/conf -Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example results matching on the name of a dataset. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ```` element and its contents. +Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example prioritizing results from Dataverses over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ```` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev . Dataverse requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-7.3.0/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400`` -With the Dataverse-specific config in place, you can now start Solr and create the core that will be used to manage search information:: +Solr will warn about needing to increase the number of file descriptors and max processes in a production environment but will still run with defaults. We have increased these values to the recommended levels by adding ulimit -n 65000 to the init script, and the following to ``/etc/security/limits.conf``:: + + solr soft nproc 65000 + solr hard nproc 65000 + solr soft nofile 65000 + solr hard nofile 65000 + +On operating systems which use systemd such as RHEL or CentOS 7, you may then add a line like LimitNOFILE=65000 to the systemd unit file, or adjust the limits on a running process using the prlimit tool:: + + # sudo prlimit --pid pid --nofile=65000:65000 + +Solr launches asynchronously and attempts to use the ``lsof`` binary to watch for its own availability. Installation of this package isn't required but will prevent a warning in the log at startup. + +Finally, you may start Solr and create the core that will be used to manage search information:: cd /usr/local/solr/solr-7.3.0 bin/solr start bin/solr create_core -c collection1 -d server/solr/collection1/conf/ -Please note: Solr will warn about needing to increase the number of file descriptors and max processes in a production environment but will still run with defaults. We have increased these values to the recommended levels by adding ulimit -n 65000 to the init script and adding solr soft nproc 65000 to /etc/security/limits.conf. On operating systems which use systemd such as RHEL or CentOS 7, you may add a line like LimitNOFILE=65000 to the systemd unit file, or adjust the limits on a running process using the prlimit tool: - - # sudo prlimit --pid pid --nofile=65000:65000 - Solr Init Script ================ diff --git a/doc/sphinx-guides/source/user/appendix.rst b/doc/sphinx-guides/source/user/appendix.rst index a57e1f6fdfb..891694eecea 100755 --- a/doc/sphinx-guides/source/user/appendix.rst +++ b/doc/sphinx-guides/source/user/appendix.rst @@ -26,4 +26,4 @@ Detailed below are what metadata schemas we support for Citation and Domain Spec `Virtual Observatory (VO) Discovery and Provenance Metadata `__ (`see .tsv version `__). - `Life Sciences Metadata `__: based on `ISA-Tab Specification `__, along with controlled vocabulary from subsets of the `OBI Ontology `__ and the `NCBI Taxonomy for Organisms `__ (`see .tsv version `__). -See also the `Dataverse 4.0 Metadata Crosswalk: DDI, DataCite, DC, DCTerms, VO, ISA-Tab `__ document. +See also the `Dataverse 4.0 Metadata Crosswalk: DDI, DataCite, DC, DCTerms, VO, ISA-Tab `__ document and the :doc:`/admin/metadatacustomization` section of the Admin Guide. diff --git a/doc/sphinx-guides/source/user/dataset-management.rst b/doc/sphinx-guides/source/user/dataset-management.rst index 337063e1caa..51c409cc657 100755 --- a/doc/sphinx-guides/source/user/dataset-management.rst +++ b/doc/sphinx-guides/source/user/dataset-management.rst @@ -20,7 +20,7 @@ A dataset contains three levels of metadata: For more details about what Citation and Domain Specific Metadata is supported please see our :ref:`user-appendix`. -Note that once a dataset has been published its metadata may be exported. A button on the dataset page's metadata tab will allow a user to export the metadata of the most recently published version of the dataset. Currently supported export formats are DDI, Dublin Core and JSON. +Note that once a dataset has been published its metadata may be exported. A button on the dataset page's metadata tab will allow a user to export the metadata of the most recently published version of the dataset. Currently supported export formats are DDI, Dublin Core, Schema.org JSON-LD, and Dataverse's native JSON format. Adding a New Dataset ==================== @@ -40,23 +40,94 @@ Note: You can add additional metadata once you have completed the initial datase Supported HTML Fields --------------------- -We currently only support the following HTML tags for any of our textbox meatdata fields (i.e., Description) : , ,
, +We currently only support the following HTML tags for any of our textbox metadata fields (i.e., Description) : , ,
,
, , ,
,
,
, ,
,

-

, , , ,
  • ,
      ,

      , 

      , , , , 
 , , 
        .
 
-File Handling and Uploading
-===========================
+File Upload
+==============
 
-To upload new files to a dataset, click the "Edit" button at the top of the dataset page and from the dropdown list select "Files (Upload)" or click the "Upload Files" button above the files table in the Files tab. From either option you will be brought to the Upload Files page for that dataset.
+The Dataverse software offers multiple methods of uploading files to a dataset. These upload methods are configurable by the administrator of a Dataverse installation, so you might not see some of these options on the Dataverse site you're using.
 
-Once you have uploaded files, you will be able to edit file metadata, restrict access to files [#f1]_ , and/or add tags. Click "Save Changes" to complete the upload. If you uploaded a file by mistake, you can delete it before saving by clicking the checkbox to select the file, and then clicking the "Delete" button above the Files Table.
+If there are multiple upload options available, then you must choose which one to use for your dataset. A dataset may only use one upload method. Once you upload a file using one of the available upload methods, that method is locked in for that dataset. If you need to switch upload methods for a dataset that already contains files, then please contact Support by clicking on the Support link at the top of the application.
+
+You can upload files to a dataset while first creating that dataset. You can also upload files after creating a dataset by clicking the "Edit" button at the top of the dataset page and from the dropdown list selecting "Files (Upload)" or clicking the "Upload Files" button above the files table in the Files tab. From either option you will be brought to the Upload Files page for that dataset.
+
+Certain file types in Dataverse are supported by additional functionality, which can include downloading in different formats, subsets, file-level metadata preservation, file-level data citation; and exploration through data visualization and analysis. See the File Handling section of this page for more information.
+
+
+HTTP Upload
+-----------
+
+HTTP Upload is a common browser-based file upload tool you may be familiar with from other web applications. You can upload files via HTTP by selecting them from your browser or dragging and dropping them into the upload widget.
 
-File upload limit size varies based on Dataverse installation. The file upload size limit can be found in the text above where files are uploaded in the application. If you have further questions, contact support for that installation by clicking on the Support link at the top of the application.
+Once you have uploaded files, you will be able to edit file metadata, restrict access to files [#f1]_ , and/or add tags. Click "Save Changes" to complete the upload. If you uploaded a file by mistake, you can delete it before saving by clicking the checkbox to select the file, and then clicking the "Delete" button above the Files Table.
 
-The file types listed in the following sections are supported by additional functionality, which can include downloading in different formats, subsets, file-level metadata preservation, file-level data citation; and exploration through data visualization and analysis. 
+File upload limit size varies based on Dataverse installation. The file upload size limit can be found in the text above the HTTP upload widget. If you need to upload a very large file or a very large *number* of files, consider using rsync + SSH upload if your installation of Dataverse offers it.
 
 .. [#f1] Some Dataverse installations do not allow this feature.
 
+Dropbox Upload
+--------------
+
+Some Dataverse installations support the ability to upload files directly from Dropbox. To do so, click the "Upload from Dropbox" button, log in to Dropbox in the pop-up window, and select the files you'd like to transfer over.
+
+.. _rsync_upload:
+
+rsync + SSH Upload
+------------------
+
+rsync is typically used for synchronizing files and directories between two different systems, using SSH to connect rather than HTTP. Some Dataverse installations allow uploads using rsync, to facilitate large file transfers in a reliable and secure manner.
+
+File Upload Script
+~~~~~~~~~~~~~~~~~~
+
+An rsync-enabled Dataverse installation has a file upload process that differs from the traditional browser-based upload process you may be used to. In order to transfer your data to Dataverse's storage, you will need to complete the following steps:
+
+1. Create your dataset. In rsync-enabled Dataverse installations, you cannot upload files until the dataset creation process is complete. After you hit "Save Dataset" on the Dataset Creation page, you will be taken to the page for your dataset.
+
+2. On the dataset page, click the "+ Upload Files" button. This will open a box with instructions and a link to the file upload script.
+
+3. Make sure your files are ready for upload. You will need to have one directory that you can point the upload script to. All files in this directory and in any subdirectories will be uploaded. The directory structure will be preserved, and will be reproduced when your dataset is downloaded from Dataverse. Note that your data will be uploaded in the form of a data package, and each dataset can only host one such package. Be sure that all files you want to include are present before you upload.
+
+4. Download the rsync file upload script by clicking the "Download Script" button in the Upload Files instruction box. There are no requirements for where you save the script; put it somewhere you can find it. Downloading the upload script will put a temporary lock on your dataset to prepare it for upload. While your dataset is locked, you will not be able to delete or publish your dataset, or edit its metadata. Once you upload your files and Dataverse processes them, your dataset will be automatically unlocked and these disabled functions will be enabled again. If you have downloaded the script and locked your dataset, but you have then changed your mind and decided *not* to upload files, please contact Support about unlocking your dataset.
+
+5. To begin the upload process, you will need to run the script you downloaded. For this, you will have to go outside your browser and open a terminal (AKA command line) window on your computer. Use the terminal to navigate to the directory where you saved the upload script, and run the command that the Upload Files instruction box provides. This will begin the upload script. Please note that this upload script will expire 7 days after you downloaded it. If it expires and you still need to use it, simply download the script from Dataverse again.
+
+**Note:** Unlike other operating systems, Windows does not come with rsync supported by default. We have not optimized this feature for Windows users, but you may be able to get it working if you install the right Unix utilities. (If you have found a way to get this feature working for you on Windows, you can contribute it to our project. Please reference our `Contributing to Dataverse `_ document in the root of the source tree.)
+
+6. Follow the instructions provided by the upload script running in your terminal. It will direct you to enter the full path of the directory where your dataset files are located, and then it will start the upload process. Once you've initiated the upload, if you need to cancel it then you can do so by canceling the script running in your terminal window. If your upload gets interrupted, you can resume it from the same point later.
+
+7. Once the upload script completes its job, Dataverse will begin processing your data upload and running a checksum validation. This may take some time depending on the file size of your upload. During processing, you will see a blue bar at the bottom of the dataset page that reads "Upload in progress..." 
+
+8. Once processing is complete, you will be notified. At this point you can publish your dataset and your data will be available for download on the dataset page.
+
+**Note:** A dataset can only hold one data package. If you need to replace the data package in your dataset, contact Support.
+
+Command-line DVUploader
+-----------------------
+
+The open-source DVUploader tool is a stand-alone command-line Java application that uses the Dataverse API to upload files to a specified Dataset. Since it can be installed by users, and requires no server-side configuration, it can be used with any Dataverse installation. It is intended as an alternative to uploading files through the Dataverse web interface in situations where the web interface is inconvenient due to the number of files or file locations (spread across multiple directories, mixed with files that have already been uploaded or file types that should be excluded) or the need to automate uploads. Since it uses the Dataverse API, transfers are limited in the same ways as HTTP uploads through the Dataverse web interface in terms of size and performance. The DVUploader logs its activity and can be killed and restarted as desired. If stopped and resumed, it will continue processing from where it left off.
+
+Usage
+~~~~~
+
+The DVUploader is open source and is available as source, as a Java jar, and with documentation at https://github.com/IQSS/dataverse-uploader. The DVUploader requires Java 1.8+. Users will need to install Java if they don't already have it and then download the DVUploader-v1.0.0.jar file. Users will need to know the URL of the Dataverse server, the DOI of their existing Dataverse Dataset, and have generated a Dataverse API Key (an option in the user's profile menu). 
+
+Basic usage is to run the command: ::
+
+    java -jar DVUploader-v1.0.0.jar -server= -did= -key= 
+
+Additional command line arguments are available to make the DVUploader list what it would do without uploading, limit the number of files it uploads, recurse through sub-directories, verify fixity, exclude files with specific extensions or name patterns, and/or wait longer than 60 seconds for any Dataverse ingest lock to clear (e.g. while the previously uploaded file is processed, as discussed in the File Handling section below). 
+
+DVUploader is a community-developed tool, and its creation was primarily supported by the Texas Digital Library. Further information and support for DVUploader can be sought at `the project's GitHub repository `_ . 
+
+File Handling
+=============
+
+Certain file types in Dataverse are supported by additional functionality, which can include downloading in different formats, subsets, file-level metadata preservation, file-level data citation; and exploration through data visualization and analysis. See the sections below for information about special functionality for specific file types.
+
+
 Tabular Data Files
 ------------------
 
@@ -113,7 +184,7 @@ Compressed files in zip format are unpacked automatically. If it fails to unpack
 
 Support for unpacking tar files will be added when this ticket is closed: https://github.com/IQSS/dataverse/issues/2195.
 
-Advanced Options
+Other File Types
 ----------------
 
 There are several advanced options available for certain file types.
@@ -121,94 +192,6 @@ There are several advanced options available for certain file types.
 - Image files: .jpg, .png, and .tif files are able to be selected as the default thumbnail for a dataset. The selected thumbnail will appear on the search result card for that dataset.
 - SPSS files: SPSS files can be tagged with the language they were originally coded in. This is found by clicking on Advanced Options and selecting the language from the list provided.
 
-.. _provenance:
-
-Data Provenance
----------------
-
-Data Provenance is a record of where your data came from and how it reached its current form. It describes the origin of a data file, any transformations that have been made to that file, and any persons or organizations associated with that file. A data file's provenance can aid in reproducibility and compliance with legal regulations. Dataverse can help you keep track of your data's provenance. Currently, Dataverse only makes provenance information available to those who have edit permissions on your dataset, but in the near future we plan to expand this feature to make provenance information available to the public. You can track our progress in `this issue `_ on the Dataverse GitHub repository.
-
-.. COMMENTED OUT UNTIL PROV FILE DOWNLOAD IS ADDED: , and make it available to those who need it.
-
-Dataverse accepts provenance information in two forms: a *Provenance File* or a free-text *Provenance Description*. You can attach this provenance information to your data files in Dataverse as part of the file upload process, by clicking Edit -> Provenance:
-
-|file-upload-prov-button|
-
-This will open a window where you can add your Provenance File and/or Provenance Description:
-
-|file-upload-prov-window|  
-
-A **Provenance File** is the preferred way of submitting provenance information to Dataverse because it provides a detailed and trustworthy record. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow.
-
-Once you upload a provenance file, Dataverse will need some additional information in order to accurately connect it to your data file. Once provenance file upload finishes, an input box labeled "Connect entity" will appear under the file. Provenance files contain a list of "entities", which include your data file as well as any objects associated with it (e.g. a chart, a spellchecker, etc.). You will need to tell Dataverse which entity within the provenance file represents your data file. You may type the name of the entity into the box, or click the arrow next to the box and select the entity from a list of all entities in the provenance file. 
-
-For more information on entities and the contents of provenance files, see `the W3C PROV Model Primer  `_.
-
-Once you've uploaded your Provenance File and connected the proper entity, you can hit the Preview button to view the raw JSON of the Provenance File. This can help you confirm that you've uploaded the right file. Be sure to double-check it, because the Provenance File will made *permanent* once it's finalized. At that point you will not be able to *replace*, *remove*, or otherwise *edit* the Provenance File. This ensures that the Provenance File maintains a stable, immutable record of the data file's history. This finalization of the Provenance File happens at different points depending on the status of your data file. If this is a brand new data file that has never been published before, then its associated Provenance File will be made permanent once you publish the dataset. If this data file *has* been published in a previous version of your dataset, then its associated Provenance File will be made permanent as soon as you upload the Provenance File and click "Save Changes" on the warning popup.
-
-.. COMMENTED OUT UNTIL PROV GRAPH IS ADDED:  A **Provenance File** is the preferred way of submitting provenance information to Dataverse, as it allows Dataverse to automatically generate a detailed graph of the data file's provenance. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow. Each data file in Dataverse can have one provenance file attached to it. Dataverse uses this provenance file to generate a provenance graph that can be viewed under the Provenance tab of the file page. Once you've added your provenance file, you can click the Preview button to make sure it's accurate.
-
-A **Provenance Description** allows you to add more provenance information in addition to or in place of a provenance file. This is a free-text field that allows you to enter any information you feel might be relevant to those interested in learning about the provenance of your data. This might be a good place to describe provenance factors like what operating system you used when working with the data file, what functions or libraries you used, how data was merged into the file, what version of the file you used, etc. The Provenance Description is not as useful or trustworthy as a provenance file, but it can still provide value. Unlike the Provenance File, the Provenance Description is never made permanent: you can always edit, remove, or replace it at any time.
-
-You can return to attach provenance to your data file later on by clicking the "Add + Edit Metadata" button on the file page, and then clicking the "Edit -> Provenance" button.
-
-..	COMMENTED OUT UNTIL PROV TAB IS ADDED: 
-..	You can also attach provenance to your data file later on by clicking the "Add Provenance" button on the file page, under the Provenance tab: 
-..
-..	**(Insert screenshot of Provenance Tab's "Add Provenance button" here, once that functionality is developed)**
-
-.. COMMENTED OUT UNTIL PROV GRAPH IS ADDED: 
-.. Once a data file with an attached provenance file is published, you can see a graph of that file's provenance under the Provenance tab on the file page.
-
-.. _rsync_upload:
-
-rsync Upload
-------------
-
-rsync is typically used for synchronizing files and directories between two different systems, using SSH to connect rather than HTTP. Some Dataverse installations allow uploads using rsync, to facilitate large file transfers in a reliable and secure manner.
-
-File Upload Script
-~~~~~~~~~~~~~~~~~~
-
-An rsync-enabled Dataverse installation has a file upload process that differs from the traditional browser-based upload process you may be used to. In order to transfer your data to Dataverse's storage, you will need to complete the following steps:
-
-1. Create your dataset. In rsync-enabled Dataverse installations, you cannot upload files until the dataset creation process is complete. After you hit "Save Dataset" on the Dataset Creation page, you will be taken to the page for your dataset.
-
-2. On the dataset page, click the "+ Upload Files" button. This will open a box with instructions and a link to the file upload script.
-
-3. Make sure your files are ready for upload. You will need to have one directory that you can point the upload script to. All files in this directory and in any subdirectories will be uploaded. The directory structure will be preserved, and will be reproduced when your dataset is downloaded from Dataverse. Note that your data will be uploaded in the form of a data package, and each dataset can only host one such package. Be sure that all files you want to include are present before you upload.
-
-4. Download the rsync file upload script by clicking the "Download Script" button in the Upload Files instruction box. There are no requirements for where you save the script; put it somewhere you can find it. Downloading the upload script will put a temporary lock on your dataset to prepare it for upload. While your dataset is locked, you will not be able to delete or publish your dataset, or edit its metadata. Once you upload your files and Dataverse processes them, your dataset will be automatically unlocked and these disabled functions will be enabled again. If you have downloaded the script and locked your dataset, but you have then changed your mind and decided *not* to upload files, please contact Support about unlocking your dataset.
-
-5. To begin the upload process, you will need to run the script you downloaded. For this, you will have to go outside your browser and open a terminal (AKA command line) window on your computer. Use the terminal to navigate to the directory where you saved the upload script, and run the command that the Upload Files instruction box provides. This will begin the upload script. Please note that this upload script will expire 7 days after you downloaded it. If it expires and you still need to use it, simply download the script from Dataverse again.
-
-**Note:** Unlike other operating systems, Windows does not come with rsync supported by default. We have not optimized this feature for Windows users, but you may be able to get it working if you install the right Unix utilities. (If you have found a way to get this feature working for you on Windows, you can contribute it to our project. Please reference our `Contributing to Dataverse `_ document in the root of the source tree.)
-
-6. Follow the instructions provided by the upload script running in your terminal. It will direct you to enter the full path of the directory where your dataset files are located, and then it will start the upload process. Once you've initiated the upload, if you need to cancel it then you can do so by canceling the script running in your terminal window. If your upload gets interrupted, you can resume it from the same point later.
-
-7. Once the upload script completes its job, Dataverse will begin processing your data upload and running a checksum validation. This may take some time depending on the file size of your upload. During processing, you will see a blue bar at the bottom of the dataset page that reads "Upload in progress..." 
-
-8. Once processing is complete, you will be notified. At this point you can publish your dataset and your data will be available for download on the dataset page. **Note:** A dataset can only hold one data package. If you need to replace the data package in your dataset, contact Support.
-
-**Note:** A dataset can only hold one data package. If you need to replace the data package in your dataset, contact Support.
-
-.. _cloud-storage:
-
-Cloud Storage + Computing
--------------------------
-
-Dataverse installations can be configured to facilitate cloud-based storage and/or computing (this feature is considered experimental at this time, and some of the kinks are still being worked out). While the default configuration for Dataverse uses a local file system for storing data, a cloud-enabled Dataverse installation can use a Swift object storage database for its data. This allows users to perform computations on data using an integrated cloud computing environment.
-
-Cloud Computing
-~~~~~~~~~~~~~~~
-
-The "Compute" button on dataset and file pages will allow you to compute on a single dataset, multiple datasets, or a single file. You can use it to build a compute batch and go directly to the cloud computing environment that is integrated with Dataverse.
-
-Cloud Storage Access
-~~~~~~~~~~~~~~~~~~~~
-
-If you need to access a dataset in a more flexible way than the Compute button provides, then you can use the Cloud Storage Access box on the dataset page to copy the dataset's container name. This unique identifer can then be used to allow direct access to the dataset.
-
 Edit Files
 ==========
 
@@ -314,6 +297,45 @@ When you access a dataset's file-level permissions page, you will see two sectio
 
 **Restricted Files:** In this section, you can see the same information, but broken down by each individual file in your dataset. For each file, you can click the "Assign Access" button to see a box where you can grant access to that file to specific users or groups.
 
+.. _provenance:
+
+Data Provenance
+===============
+
+Data Provenance is a record of where your data came from and how it reached its current form. It describes the origin of a data file, any transformations that have been made to that file, and any persons or organizations associated with that file. A data file's provenance can aid in reproducibility and compliance with legal regulations. Dataverse can help you keep track of your data's provenance. Currently, Dataverse only makes provenance information available to those who have edit permissions on your dataset, but in the near future we plan to expand this feature to make provenance information available to the public. You can track our progress in `this issue `_ on the Dataverse GitHub repository.
+
+.. COMMENTED OUT UNTIL PROV FILE DOWNLOAD IS ADDED: , and make it available to those who need it.
+
+Dataverse accepts provenance information in two forms: a *Provenance File* or a free-text *Provenance Description*. You can attach this provenance information to your data files in Dataverse as part of the file upload process, by clicking Edit -> Provenance:
+
+|file-upload-prov-button|
+
+This will open a window where you can add your Provenance File and/or Provenance Description:
+
+|file-upload-prov-window|  
+
+A **Provenance File** is the preferred way of submitting provenance information to Dataverse because it provides a detailed and trustworthy record. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow.
+
+Once you upload a provenance file, Dataverse will need some additional information in order to accurately connect it to your data file. Once provenance file upload finishes, an input box labeled "Connect entity" will appear under the file. Provenance files contain a list of "entities", which include your data file as well as any objects associated with it (e.g. a chart, a spellchecker, etc.). You will need to tell Dataverse which entity within the provenance file represents your data file. You may type the name of the entity into the box, or click the arrow next to the box and select the entity from a list of all entities in the provenance file. 
+
+For more information on entities and the contents of provenance files, see `the W3C PROV Model Primer  `_.
+
+Once you've uploaded your Provenance File and connected the proper entity, you can hit the Preview button to view the raw JSON of the Provenance File. This can help you confirm that you've uploaded the right file. Be sure to double-check it, because the Provenance File will made *permanent* once it's finalized. At that point you will not be able to *replace*, *remove*, or otherwise *edit* the Provenance File. This ensures that the Provenance File maintains a stable, immutable record of the data file's history. This finalization of the Provenance File happens at different points depending on the status of your data file. If this is a brand new data file that has never been published before, then its associated Provenance File will be made permanent once you publish the dataset. If this data file *has* been published in a previous version of your dataset, then its associated Provenance File will be made permanent as soon as you upload the Provenance File and click "Save Changes" on the warning popup.
+
+.. COMMENTED OUT UNTIL PROV GRAPH IS ADDED:  A **Provenance File** is the preferred way of submitting provenance information to Dataverse, as it allows Dataverse to automatically generate a detailed graph of the data file's provenance. Provenance files are typically generated during the process of data analysis, using provenance capture tools like provR, RDataTracker, NoWorkFlow, recordr, or CamFlow. Each data file in Dataverse can have one provenance file attached to it. Dataverse uses this provenance file to generate a provenance graph that can be viewed under the Provenance tab of the file page. Once you've added your provenance file, you can click the Preview button to make sure it's accurate.
+
+A **Provenance Description** allows you to add more provenance information in addition to or in place of a provenance file. This is a free-text field that allows you to enter any information you feel might be relevant to those interested in learning about the provenance of your data. This might be a good place to describe provenance factors like what operating system you used when working with the data file, what functions or libraries you used, how data was merged into the file, what version of the file you used, etc. The Provenance Description is not as useful or trustworthy as a provenance file, but it can still provide value. Unlike the Provenance File, the Provenance Description is never made permanent: you can always edit, remove, or replace it at any time.
+
+You can return to attach provenance to your data file later on by clicking the "Add + Edit Metadata" button on the file page, and then clicking the "Edit -> Provenance" button.
+
+..	COMMENTED OUT UNTIL PROV TAB IS ADDED: 
+..	You can also attach provenance to your data file later on by clicking the "Add Provenance" button on the file page, under the Provenance tab: 
+..
+..	**(Insert screenshot of Provenance Tab's "Add Provenance button" here, once that functionality is developed)**
+
+.. COMMENTED OUT UNTIL PROV GRAPH IS ADDED: 
+.. Once a data file with an attached provenance file is published, you can see a graph of that file's provenance under the Provenance tab on the file page.
+
 .. _thumbnails-widgets:
 
 Thumbnails + Widgets
@@ -417,6 +439,23 @@ To view exactly what has changed, starting from the originally published version
 
 Once you have more than one version (this can simply be version 1 and a draft), you can click the "View Details" link next to each summary to learn more about the metadata fields and files that were either added or edited. You can also click the checkboxes to select any two dataset versions, then click the "View Differences" button to open the Version Differences Details popup and compare the differences between them.
 
+.. _cloud-storage:
+
+Cloud Storage + Computing
+=========================
+
+Dataverse installations can be configured to facilitate cloud-based storage and/or computing (this feature is considered experimental at this time, and some of the kinks are still being worked out). While the default configuration for Dataverse uses a local file system for storing data, a cloud-enabled Dataverse installation can use a Swift object storage database for its data. This allows users to perform computations on data using an integrated cloud computing environment.
+
+Cloud Computing
+---------------
+
+The "Compute" button on dataset and file pages will allow you to compute on a single dataset, multiple datasets, or a single file. You can use it to build a compute batch and go directly to the cloud computing environment that is integrated with Dataverse.
+
+Cloud Storage Access
+--------------------
+
+If you need to access a dataset in a more flexible way than the Compute button provides, then you can use the Cloud Storage Access box on the dataset page to copy the dataset's container name. This unique identifer can then be used to allow direct access to the dataset.
+
 .. _deaccession:
 
 Dataset Deaccession
diff --git a/doc/sphinx-guides/source/user/dataverse-management.rst b/doc/sphinx-guides/source/user/dataverse-management.rst
index 4aa39f8a23a..9fe3da59bcd 100755
--- a/doc/sphinx-guides/source/user/dataverse-management.rst
+++ b/doc/sphinx-guides/source/user/dataverse-management.rst
@@ -112,6 +112,8 @@ When you access a dataverse's permissions page, you will see three sections:
 
 **Roles:** Here you can reference a full list of roles that can be assigned to users of your dataverse. Each role lists the permissions that it offers.
 
+Please note that even on a newly created dataverse, you may see user and groups have already been granted role(s) if your installation has ``:InheritParentRoleAssignments`` set. For more on this setting, see the :doc:`/installation/config` section of the Installation Guide.
+
 Setting Access Configurations
 ---------------------------------------------
 Under the Permissions tab, you can click the "Edit Access" button to open a box where you can add to your dataverse and what permissions are granted to those who add to your dataverse.
diff --git a/doc/sphinx-guides/source/user/find-use-data.rst b/doc/sphinx-guides/source/user/find-use-data.rst
index 846f2a4eb8f..8d19747fb18 100755
--- a/doc/sphinx-guides/source/user/find-use-data.rst
+++ b/doc/sphinx-guides/source/user/find-use-data.rst
@@ -17,7 +17,7 @@ Basic Search
 You can search the entire contents of the Dataverse installation, including dataverses, datasets, and files. You can access the search through the search bar on the homepage, or by clicking the magnifying glass icon in the header of every page. The search bar accepts search terms, queries, or exact phrases (in quotations).
 
 Sorting and Viewing Search Results
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Facets: to the left of the search results, there are several facets a user can click on to narrow the number of results displayed.
     - Choosing a facet: to choose a facet to narrow your results by, click on that facet.
@@ -76,13 +76,12 @@ Download Files
 
 Within the Files tab on a dataset page, you can download the files in that dataset. To download more than one file at a time, select the files you would like to download and then click the Download button above the files. The selected files will download in zip format.
 
-You may also download a file from its file page by clicking the Download button in the upper right corner of the page, or by using the Download URL listed under the Metadata tab on the lower half of the page. The Download URL can be used to directly access the file via API (or in a web browser, if needed). Certain files do not provide Download URLs for technical reasons: those that are restricted, have terms of use associated with them, or are part of a dataverse with a guestbook enabled.
-
-Tabular data files offer additional options: You can explore using the TwoRavens data visualization tool (or other :doc:`/installation/external-tools` if they have been enabled) by clicking the Explore button, or choose from a number of tabular-data-specific download options available as a dropdown under the Download button.
+You may also download a file from its file page by clicking the Download button in the upper right corner of the page, or by :ref:`url_download` under the Metadata tab on the lower half of the page.
 
+Tabular data files offer additional options: You can explore using any data exploration or visualization :doc:`/installation/external-tools` (if they have been enabled) by clicking the Explore button, or choose from a number of tabular-data-specific download options available as a dropdown under the Download button.
 
 Tabular Data
-------------
+^^^^^^^^^^^^
 
 Ingested files can be downloaded in several different ways. 
 
@@ -96,16 +95,33 @@ Ingested files can be downloaded in several different ways.
 
 - A subset of the columns of the data
 
+
+.. _url_download:
+
+Downloading via URL
+^^^^^^^^^^^^^^^^^^^^
+
+Dataverse displays a plaintext URL for the location of the file under the Metadata tab on the dataset page. This Download URL can be used to directly access the file via API (or in a web browser, if needed). When downloading larger files, in order to ensure a reliable, resumable download, we recommend using `GNU Wget `_ in a command line terminal or using a download manager software of your choice.
+ 
+Certain files do not provide Download URLs for technical reasons: those that are restricted, have terms of use associated with them, or are part of a dataverse with a guestbook enabled. 
+
+.. _package_download_url:
+
+Downloading a Dataverse Package via URL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Dataverse Packages are typically used to represent extremely large files or bundles containing a large number of files. Dataverse Packages are often too large to be reliably downloaded using a web browser. When you click to download a Dataverse Package, instead of automatically initiating the download in your web browser, Dataverse displays a plaintext URL for the location of the file. To ensure a reliable, resumable download, we recommend using `GNU Wget `_ in a command line terminal or using a download manager software of your choice. If you try to simply paste the URL into your web browser then the download may overwhelm your browser, resulting in an interrupted, timed out, or otherwise failed download.
+
 .. _rsync_download:
 
 Downloading a Dataverse Package via rsync
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-rsync is typically used for synchronizing files and directories between two different systems, using SSH to connect rather than HTTP. Some Dataverse installations allow downloads using rsync, to facilitate large file transfers in a reliable and secure manner.
+rsync is typically used for synchronizing files and directories between two different systems. Some Dataverse installations allow downloads using rsync, to facilitate large file transfers in a reliable and secure manner.
 
-rsync-enabled Dataverse installations have a new file download process that differs from traditional browser-based downloading. Instead of multiple files, each dataset contains a single "Dataverse Package". When you download this package you will receive a folder that contains all files from the dataset, arranged in the exact folder structure in which they were originally uploaded.
+rsync-enabled Dataverse installations offer a new file download process that differs from traditional browser-based downloading. Instead of multiple files, each dataset uploaded via rsync contains a single "Dataverse Package". When you download this package you will receive a folder that contains all files from the dataset, arranged in the exact folder structure in which they were originally uploaded.
 
-At the bottom of the dataset page, under the **Data Access** tab, instead of a download button you will find the information you need in order to download a Dataverse Package using rsync. If the data is locally available to you (on a shared drive, for example) then you can find it at the folder path under **Local Access**. Otherwise, to download the Dataverse Package you will have to use one of the rsync commands under **Download Access**. There may be multiple commands listed, each corresponding to a different mirror that hosts the Dataverse Package. Go outside your browser and open a terminal (AKA command line) window on your computer. Use the terminal to run the command that corresponds with the mirror of your choice. It's usually best to choose the mirror that is geographically closest to you. Running this command will initiate the download process.
+In a dataset containing a Dataverse Package, at the bottom of the dataset page, under the **Data Access** tab, instead of a download button you will find the information you need in order to download the Dataverse Package using rsync. If the data is locally available to you (on a shared drive, for example) then you can find it at the folder path under **Local Access**. Otherwise, to download the Dataverse Package you will have to use one of the rsync commands under **Download Access**. There may be multiple commands listed, each corresponding to a different mirror that hosts the Dataverse Package. Go outside your browser and open a terminal (AKA command line) window on your computer. Use the terminal to run the command that corresponds with the mirror of your choice. It's usually best to choose the mirror that is geographically closest to you. Running this command will initiate the download process.
 
 After you've downloaded the Dataverse Package, you may want to double-check that your download went perfectly. Under **Verify Data**, you'll find a command that you can run in your terminal that will initiate a checksum to ensure that the data you downloaded matches the data in Dataverse precisely. This way, you can ensure the integrity of the data you're working with. 
 
diff --git a/doc/sphinx-guides/source/versions.rst b/doc/sphinx-guides/source/versions.rst
index 5dcf2f6d78a..f968ecfc3dc 100755
--- a/doc/sphinx-guides/source/versions.rst
+++ b/doc/sphinx-guides/source/versions.rst
@@ -6,7 +6,8 @@ Dataverse Guides Versions
 
 This list provides a way to refer to previous versions of the Dataverse guides, which we still host. In order to learn more about the updates delivered from one version to another, visit the `Releases `__ page in our GitHub repo.
 
-- 4.9.4
+- 4.10
+- `4.9.4 `__
 - `4.9.3 `__
 - `4.9.2 `__
 - `4.9.1 `__
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.md5 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.md5
new file mode 100644
index 00000000000..d8b1ce2fa75
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.md5
@@ -0,0 +1 @@
+f578d8ec91811d5d72981355cb7a1f0f
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.sha1 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.sha1
new file mode 100644
index 00000000000..4c7d114634b
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.jar.sha1
@@ -0,0 +1 @@
+523abaf48b4423eb874dbc086b876aa917930a04
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.md5
new file mode 100644
index 00000000000..15f47f4140a
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.md5
@@ -0,0 +1 @@
+346e9f235523e52256006bbe8eba60bb
diff --git a/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.sha1
new file mode 100644
index 00000000000..88668a4d49c
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-common/4.1.0-header-patch/xoai-common-4.1.0-header-patch.pom.sha1
@@ -0,0 +1 @@
+cd83d08c097d6aa1b27b20ef4742c7e4fa47e6b5
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.md5
new file mode 100644
index 00000000000..67dda34a6c9
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.md5
@@ -0,0 +1 @@
+546f1ab3f3f654280f88e429ba3471ae
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.sha1
new file mode 100644
index 00000000000..50e8f2f42cd
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-javadoc.jar.sha1
@@ -0,0 +1 @@
+f4da7ebc3fda69e1e7db12bda6d7b5fb4aecc7a4
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.md5
new file mode 100644
index 00000000000..77416d80f87
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.md5
@@ -0,0 +1 @@
+ec87ba7cb8e7396fc903acdbacd31ff6
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.sha1
new file mode 100644
index 00000000000..a6157b4dc0b
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch-sources.jar.sha1
@@ -0,0 +1 @@
+370c2955550a42b11fe7b9007771c506f5769639
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.md5
new file mode 100644
index 00000000000..27381662d09
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.md5
@@ -0,0 +1 @@
+544e9b97062d054370695b9b09d4bb1c
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.sha1
new file mode 100644
index 00000000000..37dd4e47c2c
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.jar.sha1
@@ -0,0 +1 @@
+67c505461f3c190894bb036cc866eb640c2f6a48
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.md5
new file mode 100644
index 00000000000..5959ea476c7
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.md5
@@ -0,0 +1 @@
+a1b49c13fcf448de9628798f8682fcaa
diff --git a/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.sha1
new file mode 100644
index 00000000000..87fd86c23e0
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-data-provider/4.1.0-header-patch/xoai-data-provider-4.1.0-header-patch.pom.sha1
@@ -0,0 +1 @@
+41be98af31f8d17d83ab6c38bd7939ba212eab8d
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.md5
new file mode 100644
index 00000000000..c9e720e6039
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.md5
@@ -0,0 +1 @@
+21bc45a29b715720f4b77f51bf9f1754
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.sha1
new file mode 100644
index 00000000000..756955d2840
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-javadoc.jar.sha1
@@ -0,0 +1 @@
+b544162e82d322116b87d99f2fbb6ddd4c4745e1
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.md5
new file mode 100644
index 00000000000..27c55f9af58
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.md5
@@ -0,0 +1 @@
+88dc05805672ebe01ded1197a582cd60
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.sha1
new file mode 100644
index 00000000000..1098e506b93
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch-sources.jar.sha1
@@ -0,0 +1 @@
+fe41289cb74c56e9282dd09c22df2eda47c68a0d
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.md5
new file mode 100644
index 00000000000..84891040047
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.md5
@@ -0,0 +1 @@
+52f8b446f78009757d593312778f428c
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.sha1
new file mode 100644
index 00000000000..dbded3dd83f
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.jar.sha1
@@ -0,0 +1 @@
+feb6903ad32d4b42461b7ca1b3fae6146740bb31
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.md5
new file mode 100644
index 00000000000..5e51f198572
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.md5
@@ -0,0 +1 @@
+b97b8ee92daa5fc4fd87004465f9ad2b
diff --git a/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.sha1
new file mode 100644
index 00000000000..2c6dc74f02b
--- /dev/null
+++ b/local_lib/com/lyncode/xoai-service-provider/4.1.0-header-patch/xoai-service-provider-4.1.0-header-patch.pom.sha1
@@ -0,0 +1 @@
+f772583549263bd72ea4d5268d9db0a84c27cb9f
diff --git a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.md5 b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.md5
new file mode 100644
index 00000000000..d2fdadd114f
--- /dev/null
+++ b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.md5
@@ -0,0 +1 @@
+b50966bebe8cfdcb58478cf029b08aa3
diff --git a/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.sha1 b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.sha1
new file mode 100644
index 00000000000..b142cd649e8
--- /dev/null
+++ b/local_lib/com/lyncode/xoai/4.1.0-header-patch/xoai-4.1.0-header-patch.pom.sha1
@@ -0,0 +1 @@
+28a5d65399cbc25b29b270caebbb86e292c5ba18
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.jar.md5 b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.jar.md5
new file mode 100644
index 00000000000..9840dffe677
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.jar.md5
@@ -0,0 +1 @@
+f9bb7a20a9d538819606ec1630d661fe
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.jar.sha1 b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.jar.sha1
new file mode 100644
index 00000000000..8d2333a8c2b
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.jar.sha1
@@ -0,0 +1 @@
+37a9d8e464a57b90c04252f265572e5274beb605
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.pom.md5 b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.pom.md5
new file mode 100644
index 00000000000..e248ce1a5df
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.pom.md5
@@ -0,0 +1 @@
+c2d1a458dc809cb3833f3b362a23ed79
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.pom.sha1 b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.pom.sha1
new file mode 100644
index 00000000000..e3dba1303d9
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-handler/1.11.0/jhove-handler-1.11.0.pom.sha1
@@ -0,0 +1 @@
+0f195ee47691c7ee8611db63b6d5ee262c139129
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.jar.md5 b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.jar.md5
new file mode 100644
index 00000000000..5643f23cdf3
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.jar.md5
@@ -0,0 +1 @@
+c3605bd6434ebeef82ef655d21075652
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.jar.sha1 b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.jar.sha1
new file mode 100644
index 00000000000..38510b3afc3
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.jar.sha1
@@ -0,0 +1 @@
+d8dc496b4d408dd6a9ed7429e6fa4d1ce5f57403
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.pom.md5 b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.pom.md5
new file mode 100644
index 00000000000..4d11568ae43
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.pom.md5
@@ -0,0 +1 @@
+bcac19fbdf825c5e93e785413815b998
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.pom.sha1 b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.pom.sha1
new file mode 100644
index 00000000000..01ca799d4c1
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove-module/1.11.0/jhove-module-1.11.0.pom.sha1
@@ -0,0 +1 @@
+1f983c8cf895056f4d4efe7a717b8d73d5c6b091
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.jar.md5 b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.jar.md5
new file mode 100644
index 00000000000..f34f0d62da1
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.jar.md5
@@ -0,0 +1 @@
+3f6f413fb54c5142f2e34837bb9369b4
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.jar.sha1 b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.jar.sha1
new file mode 100644
index 00000000000..772766ad997
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.jar.sha1
@@ -0,0 +1 @@
+475409b6444aba6bdc96ce42431b6d601c7abe5f
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.pom.md5 b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.pom.md5
new file mode 100644
index 00000000000..433c1031bcd
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.pom.md5
@@ -0,0 +1 @@
+7f9939585e369ad60ac1f8a99b2fa75f
diff --git a/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.pom.sha1 b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.pom.sha1
new file mode 100644
index 00000000000..acfde074c96
--- /dev/null
+++ b/local_lib/edu/harvard/hul/ois/jhove/jhove/1.11.0/jhove-1.11.0.pom.sha1
@@ -0,0 +1 @@
+804fffb163526c6bea975038702ea90f24f89419
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.md5 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.md5
new file mode 100644
index 00000000000..7018ea4e822
--- /dev/null
+++ b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.md5
@@ -0,0 +1 @@
+eeef5c0dc201d1105b9529a51fa8cdab
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.sha1 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.sha1
new file mode 100644
index 00000000000..97f192f3732
--- /dev/null
+++ b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.jar.sha1
@@ -0,0 +1 @@
+1fa716d318920fd59fc63f77965d113decf97355
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.md5 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.md5
new file mode 100644
index 00000000000..a88cf2a1c02
--- /dev/null
+++ b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.md5
@@ -0,0 +1 @@
+2df5dac09375e1e7fcd66c705d9ca2ef
diff --git a/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.sha1 b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.sha1
new file mode 100644
index 00000000000..967b977b79e
--- /dev/null
+++ b/local_lib/edu/harvard/iq/dvn/unf5/5.0/unf5-5.0.pom.sha1
@@ -0,0 +1 @@
+431cd55e2e9379677d14e402dd3c474bb7be4ac9
diff --git a/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.jar.md5 b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.jar.md5
new file mode 100644
index 00000000000..60015568115
--- /dev/null
+++ b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.jar.md5
@@ -0,0 +1 @@
+f6099186cd4ef67ea91b4c3b724c1113
diff --git a/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.jar.sha1 b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.jar.sha1
new file mode 100644
index 00000000000..a9340ef0a62
--- /dev/null
+++ b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.jar.sha1
@@ -0,0 +1 @@
+2232318434cab52dd755fba7003958204459f404
diff --git a/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.pom.md5 b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.pom.md5
new file mode 100644
index 00000000000..3eab42071ef
--- /dev/null
+++ b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.pom.md5
@@ -0,0 +1 @@
+b1390a875687dad3cc6527b83f84e635
diff --git a/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.pom.sha1 b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.pom.sha1
new file mode 100644
index 00000000000..9f1c0f74448
--- /dev/null
+++ b/local_lib/net/handle/handle/2006-06-16-generated/handle-2006-06-16-generated.pom.sha1
@@ -0,0 +1 @@
+a6548a529e301aeebbed9ecc0034fb7b997bd47b
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5
index 0035460d23e..576062f55a1 100644
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5
+++ b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.md5
@@ -1 +1 @@
-b0abb2fee242c479f305f47352600bbf
\ No newline at end of file
+b0abb2fee242c479f305f47352600bbf
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1
index 32d3dd392a1..e81e8450ef0 100644
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1
+++ b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.jar.sha1
@@ -1 +1 @@
-9643e138cb5ed2684838e4b4faa118adfb2ecb4b
\ No newline at end of file
+9643e138cb5ed2684838e4b4faa118adfb2ecb4b
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5
index a491d0429d6..777b4df3325 100644
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5
+++ b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.md5
@@ -1 +1 @@
-23ca47c46df791f220a87cfef3b2190c
\ No newline at end of file
+23ca47c46df791f220a87cfef3b2190c
diff --git a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1 b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1
index c57563ad26e..b5f41fd1a69 100644
--- a/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1
+++ b/local_lib/nom/tam/fits/fits/2012-10-25-generated/fits-2012-10-25-generated.pom.sha1
@@ -1 +1 @@
-c1ec9dfbbc72dc4623d309d772b804e47284ee27
\ No newline at end of file
+c1ec9dfbbc72dc4623d309d772b804e47284ee27
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.md5 b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.md5
new file mode 100644
index 00000000000..04ca3e73ce8
--- /dev/null
+++ b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.md5
@@ -0,0 +1 @@
+bd9b84a9ad737a81a2699ab81541a901
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.sha1 b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.sha1
new file mode 100644
index 00000000000..a48cef32570
--- /dev/null
+++ b/local_lib/org/dataverse/unf/6.0/unf-6.0.jar.sha1
@@ -0,0 +1 @@
+4cad279c362e4c5c17a2058dc2c8f2fc97c76bf8
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.md5 b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.md5
new file mode 100644
index 00000000000..138bc9c95f6
--- /dev/null
+++ b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.md5
@@ -0,0 +1 @@
+230c5b1f5ae71bb2fe80ef9e7209f681
diff --git a/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.sha1 b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.sha1
new file mode 100644
index 00000000000..689e8045418
--- /dev/null
+++ b/local_lib/org/dataverse/unf/6.0/unf-6.0.pom.sha1
@@ -0,0 +1 @@
+286b819f2fc7432a94b5940c6171be1589f66a37
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.md5
new file mode 100644
index 00000000000..940bfb7714e
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.md5
@@ -0,0 +1 @@
+a9eb5d004231d8edc21abff946368414
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.sha1
new file mode 100644
index 00000000000..f1b32c90caa
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-classes.jar.sha1
@@ -0,0 +1 @@
+52ef5667fec4cdb33149d2a8d0730550565a29b9
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.md5
new file mode 100644
index 00000000000..78ad5fb77f2
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.md5
@@ -0,0 +1 @@
+e79bc5e0bd4dcc23fcc5e49f8010536d
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.sha1
new file mode 100644
index 00000000000..6207b9d0478
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-javadoc.jar.sha1
@@ -0,0 +1 @@
+b3223f468f3f0dc991085ce1afe59b846cec8602
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.md5
new file mode 100644
index 00000000000..727dd333296
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+669fc3fc7b9e971f3fb089ea54fb4f93
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 00000000000..f52de46fbce
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+83b428fe09330a9a794b5d754b89f03cb9d78cd9
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.md5
new file mode 100644
index 00000000000..647a3d3d4b6
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+a5fd2dc5c41ae4840f20181f7ae7e740
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.sha1
new file mode 100644
index 00000000000..67c9b409cf7
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+b1dd4e9397d4781aa5ab9abb554cc090448fd467
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.md5 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.md5
new file mode 100644
index 00000000000..f2f1da69931
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.md5
@@ -0,0 +1 @@
+07ee3115d24eab7ad772bc5997ea4a36
diff --git a/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.sha1 b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.sha1
new file mode 100644
index 00000000000..c86067348f9
--- /dev/null
+++ b/local_lib/org/swordapp/sword2-server/1.1-SNAPSHOT/sword2-server-1.1-SNAPSHOT.war.sha1
@@ -0,0 +1 @@
+a611e672715f0c08e737e3bdd0855458984b1125
diff --git a/pom.xml b/pom.xml
index c2e4f8a82a2..1692c190922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,13 @@
 
 
     4.0.0
-
+    
     edu.harvard.iq
     dataverse
-    4.9.4
+    4.10
     war
 
     dataverse
@@ -13,7 +16,8 @@
         ${project.build.directory}/endorsed
 	UTF-8
 	-Xdoclint:none
-        1.11.172
+        
+        
         UTC
         en
         US
@@ -23,26 +27,22 @@
         -->
         -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region}
     
+        1.11.172
+        2.9.6
+        1.2
+        4.5.5
+        
         4.12
         5.3.1
         5.3.1
         1.3.1
+        2.22.0
+        0.8.2
     
 
+    
     
-        
-            prime-repo
-            PrimeFaces Maven Repository
-            http://repository.primefaces.org
-            default
-        
-        
-        
-            geotk-repo
-            Geo Toolkit Maven Repository
-            http://maven.geotoolkit.org
-            default
-        
         
             central-repo
             Central Repository
@@ -50,9 +50,10 @@
             default
         
         
-            dvn.private
-            Local repository for hosting jars not available from network repositories.
-            file://${project.basedir}/local_lib
+            prime-repo
+            PrimeFaces Maven Repository
+            http://repository.primefaces.org
+            default
         
         
             dataone.org
@@ -64,12 +65,49 @@
                 true
             
         
-
+        
+            dvn.private
+            Local repository for hosting jars not available from network repositories.
+            file://${project.basedir}/local_lib
+        
     
-  
-      
+    
+    
+    
+        
+            
+                com.amazonaws
+                aws-java-sdk-bom
+                ${aws.version}
+                pom
+                import
+            
+            
+                com.fasterxml.jackson
+                jackson-bom
+                ${jackson.version}
+                import
+                pom
+            
+            
+                commons-logging
+                commons-logging
+                ${commons.logging.version}
+            
+            
+                org.apache.httpcomponents
+                httpclient
+                ${httpcomponents.client.version}
+            
+        
+    
+    
+    
+    
     
         
             org.passay
@@ -107,7 +145,6 @@
         
             org.apache.httpcomponents
             httpclient
-            4.5.5
         
         
             org.apache.httpcomponents
@@ -135,9 +172,17 @@
             -->
             1.1-SNAPSHOT
             war
+            
+              
+                 xerces  
+                 xercesImpl 
+              
+            
         
         
             com.amazonaws
+            
             aws-java-sdk-bundle
             ${aws.version}
         
@@ -159,17 +204,33 @@
             commons-fileupload
             1.3.3
         
+        
+            
+            commons-io
+            commons-io
+            2.6
+        
         
             com.google.code.gson
             gson
             2.2.4
             compile
         
+        
+        
+            com.fasterxml.jackson.core
+            jackson-core
+        
+        
+        
+            com.fasterxml.jackson.core
+            jackson-databind
+        
         
             
-            xom
+            com.io7m.xom
             xom
-            1.1
+            1.2.10
         
         
         
@@ -291,17 +352,17 @@
         
             org.apache.poi
             poi
-            3.10-FINAL
+            4.0.0
         
         
             org.apache.poi
             poi-ooxml
-            3.10-FINAL
+            4.0.0
         
         
             org.apache.poi
             poi-examples
-            3.10-FINAL
+            4.0.0
         
         
             edu.harvard.hul.ois.jhove
@@ -320,19 +381,9 @@
         
         
         
-            javax.media
-            jai_imageio
-            1.1.1
-        
-        
-            javax.media
-            jai_core
-            1.1.3
-        
-        
-            javax.media
-            jai_codec
-            1.1.3
+            com.github.jai-imageio
+            jai-imageio-core
+            1.3.1
         
         
             org.ocpsoft.rewrite
@@ -361,11 +412,6 @@
             2.4.0
             test
         
-        
-            org.jacoco
-            jacoco-maven-plugin
-            0.7.5.201505241946
-        
         
@@ -485,6 +537,12 @@
             unirest-java
             1.4.9
         
+        
+        
+            org.apache.tika
+            tika-parsers
+            1.19
+        
     
 
     
@@ -566,7 +624,7 @@
             
                 org.apache.maven.plugins
                 maven-dependency-plugin
-                2.6
+                3.1.1
                 
                     
                         validate
@@ -591,7 +649,7 @@
             
                 org.jacoco
                 jacoco-maven-plugin
-                0.7.5.201505241946
+                ${jacoco.version}
                 
                     ${basedir}/target/coverage-reports/jacoco-unit.exec
                     ${basedir}/target/coverage-reports/jacoco-unit.exec
@@ -618,8 +676,8 @@
                 4.0.0
             
             
+            includes called javamail.providers which breaks system emails. - bsilverstein 8/8/2017 -->
+            
             
                 org.codehaus.mojo
                 truezip-maven-plugin
diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv
index e45122ef614..2e351afcf74 100644
--- a/scripts/api/data/metadatablocks/citation.tsv
+++ b/scripts/api/data/metadatablocks/citation.tsv
@@ -1,26 +1,26 @@
-#metadataBlock	name	dataverseAlias	displayName												
-	citation		Citation Metadata												
-#datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id
-	title	Title	Full title by which the Dataset is known.	Enter title...	text	0		TRUE	FALSE	FALSE	FALSE	TRUE	TRUE		citation
+#metadataBlock	name	dataverseAlias	displayName	blockURI											
+	citation		Citation Metadata	https://dataverse.org/schema/citation/											
+#datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
+	title	Title	Full title by which the Dataset is known.	Enter title...	text	0		TRUE	FALSE	FALSE	FALSE	TRUE	TRUE		citation	http://purl.org/dc/terms/title
 	subtitle	Subtitle	A secondary title used to amplify or state certain limitations on the main title.		text	1		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	alternativeTitle	Alternative Title	A title by which the work is commonly referred, or an abbreviation of the title.		text	2		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	alternativeURL	Alternative URL	A URL where the dataset can be viewed, such as a personal or project website.  	Enter full URL, starting with http://	url	3	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
+	alternativeTitle	Alternative Title	A title by which the work is commonly referred, or an abbreviation of the title.		text	2		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/alternative
+	alternativeURL	Alternative URL	A URL where the dataset can be viewed, such as a personal or project website.  	Enter full URL, starting with http://	url	3	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation	https://schema.org/distribution
 	otherId	Other ID	Another unique identifier that identifies this Dataset (e.g., producer's or another repository's number).		none	4	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	otherIdAgency	Agency	Name of agency which generated this identifier.		text	5	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation
 	otherIdValue	Identifier	Other identifier that corresponds to this Dataset.		text	6	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation
-	author	Author	The person(s), corporate body(ies), or agency(ies) responsible for creating the work.		none	7		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
+	author	Author	The person(s), corporate body(ies), or agency(ies) responsible for creating the work.		none	7		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	http://purl.org/dc/terms/creator
 	authorName	Name	The author's Family Name, Given Name or the name of the organization responsible for this Dataset.	FamilyName, GivenName or Organization	text	8	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	TRUE	author	citation
 	authorAffiliation	Affiliation	The organization with which the author is affiliated.		text	9	(#VALUE)	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE	author	citation
-	authorIdentifierScheme	Identifier Scheme	Name of the identifier scheme (ORCID, ISNI).		text	10	- #VALUE:	FALSE	TRUE	FALSE	FALSE	TRUE	FALSE	author	citation
-	authorIdentifier	Identifier	Uniquely identifies an individual author or organization, according to various schemes.		text	11	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	author	citation
+	authorIdentifierScheme	Identifier Scheme	Name of the identifier scheme (ORCID, ISNI).		text	10	- #VALUE:	FALSE	TRUE	FALSE	FALSE	TRUE	FALSE	author	citation	http://purl.org/spar/datacite/AgentIdentifierScheme
+	authorIdentifier	Identifier	Uniquely identifies an individual author or organization, according to various schemes.		text	11	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	author	citation	http://purl.org/spar/datacite/AgentIdentifier
 	datasetContact	Contact	The contact(s) for this Dataset.		none	12		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
 	datasetContactName	Name	The contact's Family Name, Given Name or the name of the organization.	FamilyName, GivenName or Organization	text	13	#VALUE	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	datasetContact	citation
 	datasetContactAffiliation	Affiliation	The organization with which the contact is affiliated.		text	14	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	datasetContact	citation
 	datasetContactEmail	E-mail	The e-mail address(es) of the contact(s) for the Dataset. This will not be displayed.		email	15	#EMAIL	FALSE	FALSE	FALSE	FALSE	TRUE	TRUE	datasetContact	citation
-	dsDescription	Description	A summary describing the purpose, nature, and scope of the Dataset.		none	16		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
+	dsDescription	Description	A summary describing the purpose, nature, and scope of the Dataset.		none	16		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	
 	dsDescriptionValue	Text	A summary describing the purpose, nature, and scope of the Dataset.		textbox	17	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	TRUE	dsDescription	citation
 	dsDescriptionDate	Date	In cases where a Dataset contains more than one description (for example, one might be supplied by the data producer and another prepared by the data repository where the data are deposited), the date attribute is used to distinguish between the two descriptions. The date attribute follows the ISO convention of YYYY-MM-DD.	YYYY-MM-DD	date	18	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	dsDescription	citation
-	subject	Subject	Domain-specific Subject Categories that are topically relevant to the Dataset.		text	19		TRUE	TRUE	TRUE	TRUE	TRUE	TRUE		citation
+	subject	Subject	Domain-specific Subject Categories that are topically relevant to the Dataset.		text	19		TRUE	TRUE	TRUE	TRUE	TRUE	TRUE		citation	http://purl.org/dc/terms/subject
 	keyword	Keyword	Key terms that describe important aspects of the Dataset.		none	20		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
 	keywordValue	Term	Key terms that describe important aspects of the Dataset. Can be used for building keyword indexes and for classification and retrieval purposes. A controlled vocabulary can be employed. The vocab attribute is provided for specification of the controlled vocabulary in use, such as LCSH, MeSH, or others. The vocabURI attribute specifies the location for the full controlled vocabulary.		text	21	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE	keyword	citation
 	keywordVocabulary	Vocabulary	For the specification of the keyword controlled vocabulary in use, such as LCSH, MeSH, or others.		text	22	(#VALUE)	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE	keyword	citation
@@ -29,13 +29,13 @@
 	topicClassValue	Term	Topic or Subject term that is relevant to this Dataset.		text	25	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	topicClassification	citation
 	topicClassVocab	Vocabulary	Provided for specification of the controlled vocabulary in use, e.g., LCSH, MeSH, etc.		text	26	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	topicClassification	citation
 	topicClassVocabURI	Vocabulary URL	Specifies the URL location for the full controlled vocabulary.	Enter full URL, starting with http://	url	27	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	topicClassification	citation
-	publication	Related Publication	Publications that use the data from this Dataset.		none	28		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation
-	publicationCitation	Citation	The full bibliographic citation for this related publication.		textbox	29	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation
-	publicationIDType	ID Type	The type of digital identifier used for this publication (e.g., Digital Object Identifier (DOI)).		text	30	#VALUE: 	TRUE	TRUE	FALSE	FALSE	TRUE	FALSE	publication	citation
-	publicationIDNumber	ID Number	The identifier for the selected ID type.		text	31	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation
-	publicationURL	URL	Link to the publication web page (e.g., journal article page, archive record page, or other).	Enter full URL, starting with http://	url	32	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	publication	citation
+	publication	Related Publication	Publications that use the data from this Dataset.		none	28		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		citation	http://purl.org/dc/terms/isReferencedBy
+	publicationCitation	Citation	The full bibliographic citation for this related publication.		textbox	29	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/dc/terms/bibliographicCitation
+	publicationIDType	ID Type	The type of digital identifier used for this publication (e.g., Digital Object Identifier (DOI)).		text	30	#VALUE: 	TRUE	TRUE	FALSE	FALSE	TRUE	FALSE	publication	citation	http://purl.org/spar/datacite/ResourceIdentifierScheme
+	publicationIDNumber	ID Number	The identifier for the selected ID type.		text	31	#VALUE	TRUE	FALSE	FALSE	FALSE	TRUE	FALSE	publication	citation		http://purl.org/spar/datacite/ResourceIdentifier
+	publicationURL	URL	Link to the publication web page (e.g., journal article page, archive record page, or other).	Enter full URL, starting with http://	url	32	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	publication	citation	https://schema.org/distribution
 	notesText	Notes	Additional important information about the Dataset.		textbox	33		FALSE	FALSE	FALSE	FALSE	TRUE	FALSE		citation
-	language	Language	Language of the Dataset		text	34		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		citation
+	language	Language	Language of the Dataset		text	34		TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		citation	http://purl.org/dc/terms/language
 	producer	Producer	Person or organization with the financial or administrative responsibility over this Dataset		none	35		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	producerName	Name	Producer name	FamilyName, GivenName or Organization	text	36	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	producer	citation
 	producerAffiliation	Affiliation	The organization with which the producer is affiliated.		text	37	(#VALUE)	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation
@@ -44,10 +44,10 @@
 	producerLogoURL	Logo URL	URL for the producer's logo, which points to this  producer's web-accessible logo image. Enter an absolute URL where the producer's logo image is found, such as http://www.my.org/images/logo.gif.	Enter full URL for image, starting with http://	url	40	
        	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	producer	citation
 	productionDate	Production Date	Date when the data collection or other materials were produced (not distributed, published or archived).	YYYY-MM-DD	date	41		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation
 	productionPlace	Production Place	The location where the data collection and any other related materials were produced.		text	42		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	contributor	Contributor	The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource.		none	43	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	contributor	Contributor	The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource.		none	43	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/contributor
 	contributorType	Type	The type of contributor of the  resource.  		text	44	#VALUE 	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	contributor	citation
 	contributorName	Name	The Family Name, Given Name or organization name of the contributor.	FamilyName, GivenName or Organization	text	45	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	contributor	citation
-	grantNumber	Grant Information	Grant Information		none	46	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	grantNumber	Grant Information	Grant Information		none	46	:	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://schema.org/sponsor
 	grantNumberAgency	Grant Agency	Grant Number Agency		text	47	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	grantNumber	citation
 	grantNumberValue	Grant Number	The grant or contract number of the project that  sponsored the effort.		text	48	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	grantNumber	citation
 	distributor	Distributor	The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions.		none	49		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
@@ -58,24 +58,24 @@
 	distributorLogoURL	Logo URL	URL of the distributor's logo, which points to this  distributor's web-accessible logo image. Enter an absolute URL where the distributor's logo image is found, such as http://www.my.org/images/logo.gif.	Enter full URL for image, starting with http://	url	54	
        	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	distributor	citation
 	distributionDate	Distribution Date	Date that the work was made available for distribution/presentation.	YYYY-MM-DD	date	55		TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation
 	depositor	Depositor	The person (Family Name, Given Name) or the name of the organization that deposited this Dataset to the repository.		text	56		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	dateOfDeposit	Deposit Date	Date that the Dataset was deposited into the repository.	YYYY-MM-DD	date	57		FALSE	FALSE	FALSE	TRUE	FALSE	FALSE		citation
-	timePeriodCovered	Time Period Covered	Time period to which the data refer. This item reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected. Also known as span.		none	58	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	dateOfDeposit	Deposit Date	Date that the Dataset was deposited into the repository.	YYYY-MM-DD	date	57		FALSE	FALSE	FALSE	TRUE	FALSE	FALSE		citation	http://purl.org/dc/terms/dateSubmitted
+	timePeriodCovered	Time Period Covered	Time period to which the data refer. This item reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected. Also known as span.		none	58	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://schema.org/temporalCoverage
 	timePeriodCoveredStart	Start	Start date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.	YYYY-MM-DD	date	59	#NAME: #VALUE 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	timePeriodCovered	citation
 	timePeriodCoveredEnd	End	End date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.	YYYY-MM-DD	date	60	#NAME: #VALUE 	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	timePeriodCovered	citation
 	dateOfCollection	Date of Collection	Contains the date(s) when the data were collected.		none	61	;	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	dateOfCollectionStart	Start	Date when the data collection started.	YYYY-MM-DD	date	62	#NAME: #VALUE 	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	dateOfCollection	citation
 	dateOfCollectionEnd	End	Date when the data collection ended.	YYYY-MM-DD	date	63	#NAME: #VALUE 	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	dateOfCollection	citation
-	kindOfData	Kind of Data	Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other.		text	64		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		citation
+	kindOfData	Kind of Data	Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other.		text	64		TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		citation	http://rdf-vocabulary.ddialliance.org/discovery#kindOfData
 	series	Series	Information about the Dataset series.		none	65	:	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
 	seriesName	Name	Name of the dataset series to which the Dataset belongs.		text	66	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	series	citation
 	seriesInformation	Information	History of the series and summary of those features that apply to the series as a whole.		textbox	67	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	series	citation
-	software	Software	Information about the software used to generate the Dataset.		none	68	,	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	software	Software	Information about the software used to generate the Dataset.		none	68	,	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://www.w3.org/TR/prov-o/#wasGeneratedBy
 	softwareName	Name	Name of software used to generate the Dataset.		text	69	#VALUE	FALSE	TRUE	FALSE	FALSE	FALSE	FALSE	software	citation
 	softwareVersion	Version	Version of the software used to generate the Dataset.		text	70	#NAME: #VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	software	citation
 	relatedMaterial	Related Material	Any material related to this Dataset.		textbox	71		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	relatedDatasets	Related Datasets	Any Datasets that are related to this Dataset, such as previous research on this subject.		textbox	72		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	otherReferences	Other References	Any references that would serve as background or supporting material to this Dataset.		text	73		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
-	dataSources	Data Sources	List of books, articles, serials, or machine-readable data files that served as the sources of the data collection.		textbox	74		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	relatedDatasets	Related Datasets	Any Datasets that are related to this Dataset, such as previous research on this subject.		textbox	72		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/relation
+	otherReferences	Other References	Any references that would serve as background or supporting material to this Dataset.		text	73		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	http://purl.org/dc/terms/references
+	dataSources	Data Sources	List of books, articles, serials, or machine-readable data files that served as the sources of the data collection.		textbox	74		FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation	https://www.w3.org/TR/prov-o/#wasDerivedFrom	
 	originOfSources	Origin of Sources	For historical materials, information about the origin of the sources and the rules followed in establishing the sources should be specified.		textbox	75		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
 	characteristicOfSources	Characteristic of Sources Noted	Assessment of characteristics and source material.		textbox	76		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
 	accessToSources	Documentation and Access to Sources	Level of documentation of the original sources.		textbox	77		FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
@@ -131,6 +131,8 @@
 	authorIdentifierScheme	ORCID		0											
 	authorIdentifierScheme	ISNI		1											
 	authorIdentifierScheme	LCNA		2											
+	authorIdentifierScheme	VIAF		3											
+	authorIdentifierScheme	GND		4											
 	language	Abkhaz		0											
 	language	Afar		1											
 	language	Afrikaans		2											
diff --git a/scripts/api/setup-all.sh b/scripts/api/setup-all.sh
index b5b36516806..d5a175f12e9 100755
--- a/scripts/api/setup-all.sh
+++ b/scripts/api/setup-all.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 SECURESETUP=1
+DV_SU_PASSWORD="admin"
 
 for opt in $*
 do
@@ -11,6 +12,11 @@ do
       "-insecure")
 	  SECURESETUP=0;
 	  ;;
+      -p=*)
+	  # https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash/14203146#14203146
+	  DV_SU_PASSWORD="${opt#*=}"
+	  shift # past argument=value
+	  ;;
       *)
 	  echo "invalid option: $opt"
 	  exit 1 >&2
@@ -54,10 +60,11 @@ curl -X PUT -d "FK2/" "$SERVER/admin/settings/:Shoulder"
 curl -X PUT -d DataCite "$SERVER/admin/settings/:DoiProvider"
 curl -X PUT -d burrito $SERVER/admin/settings/BuiltinUsers.KEY
 curl -X PUT -d localhost-only $SERVER/admin/settings/:BlockedApiPolicy
+curl -X PUT -d 'native/http' $SERVER/admin/settings/:UploadMethods
 echo
 
 echo "Setting up the admin user (and as superuser)"
-adminResp=$(curl -s -H "Content-type:application/json" -X POST -d @data/user-admin.json "$SERVER/builtin-users?password=admin&key=burrito")
+adminResp=$(curl -s -H "Content-type:application/json" -X POST -d @data/user-admin.json "$SERVER/builtin-users?password=$DV_SU_PASSWORD&key=burrito")
 echo $adminResp
 curl -X POST "$SERVER/admin/superuser/dataverseAdmin"
 echo
diff --git a/scripts/api/setup-datasetfields.sh b/scripts/api/setup-datasetfields.sh
index 4ce27bcf2a0..0d2d60b9538 100755
--- a/scripts/api/setup-datasetfields.sh
+++ b/scripts/api/setup-datasetfields.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 curl http://localhost:8080/api/admin/datasetfield/loadNAControlledVocabularyValue
+# TODO: The "@" is confusing. Consider switching to --upload-file citation.tsv
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/citation.tsv -H "Content-type: text/tab-separated-values"
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/geospatial.tsv -H "Content-type: text/tab-separated-values"
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/social_science.tsv -H "Content-type: text/tab-separated-values"
diff --git a/scripts/database/3561-update.sql b/scripts/database/3561-update.sql
deleted file mode 100644
index 8ddd3d3c02c..00000000000
--- a/scripts/database/3561-update.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- create the workflow tables
-CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
-CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
-
-CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
-CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
-
--- Alter Dataset lock
-ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
-ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
-ALTER TABLE DATASETLOCK ADD COLUMN REASON VARCHAR(255);
-
--- All existing dataset locks are due to ingest.
-UPDATE DATASETLOCK set REASON='Ingest';
-
--- /!\ Important!
--- change "1" to the an admin user id.
---
-INSERT INTO datasetlock (info, starttime, dataset_id, user_id, reason)
-SELECT '', localtimestamp, dataset_id, 1, 'InReview'
-FROM datasetversion
-WHERE inreview=true;
-
-ALTER TABLE DATASETVERSION DROP COLUMN inreview;
diff --git a/scripts/database/README_upgrade_across_versions.txt b/scripts/database/README_upgrade_across_versions.txt
new file mode 100644
index 00000000000..80cc90ab3ff
--- /dev/null
+++ b/scripts/database/README_upgrade_across_versions.txt
@@ -0,0 +1,64 @@
+We now offer an *EXPERIMENTAL* upgrade method allowing users to skip
+over a number of releases. E.g., it should be possible now to upgrade
+a Dataverse database from v4.8.6 directly to v4.10, without having to
+deploy the war files for the 5 releases between these 2 versions and
+to run the corresponding database upgrade scripts manually.
+
+One more time, it is *EXPERIMENTAL*! DO NOT attempt to run this script
+on your production database WITHOUT BACKING IT UP first!
+
+The script, dbupgrade.sh, must be run in this directory, as follows:
+
+./dbupgrade.sh [VERSION_1] [VERSION_2] [PG_HOST] [PG_PORT] [PG_DB] [PG_USER]
+
+Where 
+
+[VERSION_1] and [VERSION_2] are valid Dataverse release tags, for ex., v4.8.6 and v4.9.4;
+
+NOTE: it is your responsibility to make sure VERSION_1 is the actual
+version of your current database!
+
+[PG_HOST] is the server running PostgreSQL used by your Dataverse
+[PG_PORT] the port on the PostgreSQL server
+[PG_DB]   the name of the PostgreSQL database used by your Dataverse
+[PG_USER] the name of the PostgreSQL user used by your Dataverse
+
+The script will also ask you to provide the password for access to the
+database above (so that you don't have to enter it on the command
+line).
+
+If in doubt as to which PostgreSQL credentials to use for the above,
+just use the values listed in the dvnDbPool section of your Glassfish
+domain.xml file, for example:
+
+    
+      
+      
+      
+      
+      
+      
+    
+
+An example of the final command line, using the values above: 
+
+./dbupgrade.sh v4.8.6 v4.9.4 localhost 5432 dvndb dvnapp
+
+The script will attempt to validate the values you supply. It will
+alert you if the version tags you provided do not correspond to valid
+Dataverse releases; or if it fails to connect to the PostgreSQL
+database with the credentials you entered. It will exit with an error
+message if any of the database scripts fail to run.
+
+The script will remind you to BACK UP YOUR DATABASE before you proceed
+with it.
+
+IMPORTANT: This script will run all the create and upgrade scripts for
+all the releases up to the version to which you are upgrading. But
+please NOTE that this ONLY UPGRADES THE DATABASE. It is still your
+responsibility to read the release notes for the releases you have
+skipped, and see if there were any additional manual changes
+required. For example: new or changed JVM options in the domain.xml
+file; upgrades of 3rd party components, such as Solr search engine;
+Solr schema updates; - changes like these will still have to be made
+manually.
diff --git a/scripts/database/create/create_v4.0.1.sql b/scripts/database/create/create_v4.0.1.sql
new file mode 100644
index 00000000000..5f258f456b5
--- /dev/null
+++ b/scripts/database/create/create_v4.0.1.sql
@@ -0,0 +1,304 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, NAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, CREATETIME TIMESTAMP NOT NULL, DATAACCESSPLACE TEXT, DEACCESSIONLINK VARCHAR(255), DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, LICENSE VARCHAR(255), MINORVERSIONNUMBER BIGINT, ORIGINALARCHIVE TEXT, RELEASETIME TIMESTAMP, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, RESPONSE VARCHAR(255), CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.0.sql b/scripts/database/create/create_v4.0.sql
new file mode 100644
index 00000000000..1339d68abfa
--- /dev/null
+++ b/scripts/database/create/create_v4.0.sql
@@ -0,0 +1,224 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, NAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, CREATETIME TIMESTAMP NOT NULL, DATAACCESSPLACE TEXT, DEACCESSIONLINK VARCHAR(255), DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, LICENSE VARCHAR(255), MINORVERSIONNUMBER BIGINT, ORIGINALARCHIVE TEXT, RELEASETIME TIMESTAMP, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DATAVERSEFIELDTYPEINPUTLEVEL (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, RESPONSE VARCHAR(255), CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFIELDTYPEINPUTLEVEL ADD CONSTRAINT FK_DATAVERSEFIELDTYPEINPUTLEVEL_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFIELDTYPEINPUTLEVEL ADD CONSTRAINT FK_DATAVERSEFIELDTYPEINPUTLEVEL_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.1.sql b/scripts/database/create/create_v4.1.sql
new file mode 100644
index 00000000000..c10c8a8cd6a
--- /dev/null
+++ b/scripts/database/create/create_v4.1.sql
@@ -0,0 +1,305 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, NAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, CREATETIME TIMESTAMP NOT NULL, DATAACCESSPLACE TEXT, DEACCESSIONLINK VARCHAR(255), DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, LICENSE VARCHAR(255), MINORVERSIONNUMBER BIGINT, ORIGINALARCHIVE TEXT, RELEASETIME TIMESTAMP, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, RESPONSE VARCHAR(255), CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.10.sql b/scripts/database/create/create_v4.10.sql
new file mode 100644
index 00000000000..90391800dda
--- /dev/null
+++ b/scripts/database/create/create_v4.10.sql
@@ -0,0 +1,351 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, namespaceuri TEXT, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), AUTHORITY VARCHAR(255), CREATEDATE TIMESTAMP NOT NULL, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PROTOCOL VARCHAR(255), PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE STORAGESITE (ID  SERIAL NOT NULL, hostname TEXT, name TEXT, PRIMARYSTORAGE BOOLEAN NOT NULL, transferProtocols TEXT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE METRIC (ID  SERIAL NOT NULL, LASTCALLEDDATE TIMESTAMP NOT NULL, METRICNAME VARCHAR(255) NOT NULL UNIQUE, METRICVALUE TEXT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METRIC_id ON METRIC (id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, REQUESTOR_ID BIGINT, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO TEXT, STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DATASETEXTERNALLYRELEASED BOOLEAN, IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFILESIZE BIGINT, ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, prov_freeform TEXT, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, FILEACCESSREQUEST BOOLEAN, HARVESTIDENTIFIER VARCHAR(255), LASTEXPORTTIME TIMESTAMP, USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), FORCETYPECHECK BOOLEAN, LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FACTOR BOOLEAN, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), PREVIOUSDATAFILEID BIGINT, prov_entityname TEXT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, ENCRYPTEDPASSWORD VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_userName ON BUILTINUSER (userName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE ALTERNATIVEPERSISTENTIDENTIFIER (ID  SERIAL NOT NULL, AUTHORITY VARCHAR(255), GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, PROTOCOL VARCHAR(255), STORAGELOCATIONDESIGNATOR BOOLEAN, DVOBJECT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, uri TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE WorkflowStepData_STEPSETTINGS (WorkflowStepData_ID BIGINT, STEPSETTINGS VARCHAR(2048), STEPSETTINGS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DVOBJECT ADD CONSTRAINT UNQ_DVOBJECT_0 UNIQUE (authority,protocol,identifier);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_REQUESTOR_ID FOREIGN KEY (REQUESTOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE ALTERNATIVEPERSISTENTIDENTIFIER ADD CONSTRAINT FK_ALTERNATIVEPERSISTENTIDENTIFIER_DVOBJECT_ID FOREIGN KEY (DVOBJECT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE WorkflowStepData_STEPSETTINGS ADD CONSTRAINT FK_WorkflowStepData_STEPSETTINGS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.2.1.sql b/scripts/database/create/create_v4.2.1.sql
new file mode 100644
index 00000000000..ff36f1f35ab
--- /dev/null
+++ b/scripts/database/create/create_v4.2.1.sql
@@ -0,0 +1,308 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, RESPONSE VARCHAR(255), CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.2.2.sql b/scripts/database/create/create_v4.2.2.sql
new file mode 100644
index 00000000000..1f7222ae614
--- /dev/null
+++ b/scripts/database/create/create_v4.2.2.sql
@@ -0,0 +1,308 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.2.3.sql b/scripts/database/create/create_v4.2.3.sql
new file mode 100644
index 00000000000..1f7222ae614
--- /dev/null
+++ b/scripts/database/create/create_v4.2.3.sql
@@ -0,0 +1,308 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.2.4.sql b/scripts/database/create/create_v4.2.4.sql
new file mode 100644
index 00000000000..1f7222ae614
--- /dev/null
+++ b/scripts/database/create/create_v4.2.4.sql
@@ -0,0 +1,308 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.2.sql b/scripts/database/create/create_v4.2.sql
new file mode 100644
index 00000000000..ff36f1f35ab
--- /dev/null
+++ b/scripts/database/create/create_v4.2.sql
@@ -0,0 +1,308 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, RESPONSE VARCHAR(255), CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.3.1.sql b/scripts/database/create/create_v4.3.1.sql
new file mode 100644
index 00000000000..bfd26af491a
--- /dev/null
+++ b/scripts/database/create/create_v4.3.1.sql
@@ -0,0 +1,310 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.3.sql b/scripts/database/create/create_v4.3.sql
new file mode 100644
index 00000000000..bfd26af491a
--- /dev/null
+++ b/scripts/database/create/create_v4.3.sql
@@ -0,0 +1,310 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.4.sql b/scripts/database/create/create_v4.4.sql
new file mode 100644
index 00000000000..624a538f69b
--- /dev/null
+++ b/scripts/database/create/create_v4.4.sql
@@ -0,0 +1,313 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255) NOT NULL, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.5.1.sql b/scripts/database/create/create_v4.5.1.sql
new file mode 100644
index 00000000000..b298733f56a
--- /dev/null
+++ b/scripts/database/create/create_v4.5.1.sql
@@ -0,0 +1,328 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.5.sql b/scripts/database/create/create_v4.5.sql
new file mode 100644
index 00000000000..c0bcab722a5
--- /dev/null
+++ b/scripts/database/create/create_v4.5.sql
@@ -0,0 +1,324 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_fk_dataverse_id ON DATAVERSE (fk_dataverse_id);
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), MD5 VARCHAR(255) NOT NULL, NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_md5 ON DATAFILE (md5);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.6.1.sql b/scripts/database/create/create_v4.6.1.sql
new file mode 100644
index 00000000000..6bccb6a513d
--- /dev/null
+++ b/scripts/database/create/create_v4.6.1.sql
@@ -0,0 +1,327 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.6.2.sql b/scripts/database/create/create_v4.6.2.sql
new file mode 100644
index 00000000000..b11e42d650c
--- /dev/null
+++ b/scripts/database/create/create_v4.6.2.sql
@@ -0,0 +1,327 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.6.sql b/scripts/database/create/create_v4.6.sql
new file mode 100644
index 00000000000..bd22dbaf5ac
--- /dev/null
+++ b/scripts/database/create/create_v4.6.sql
@@ -0,0 +1,327 @@
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), RESTRICTED BOOLEAN, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.7.1.sql b/scripts/database/create/create_v4.7.1.sql
new file mode 100644
index 00000000000..c1612f2382a
--- /dev/null
+++ b/scripts/database/create/create_v4.7.1.sql
@@ -0,0 +1,327 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.7.sql b/scripts/database/create/create_v4.7.sql
new file mode 100644
index 00000000000..b11e42d650c
--- /dev/null
+++ b/scripts/database/create/create_v4.7.sql
@@ -0,0 +1,327 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), INREVIEW BOOLEAN, LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), MODIFICATIONTIME TIMESTAMP, POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT VARCHAR(255), STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESYSTEMNAME VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.1.sql b/scripts/database/create/create_v4.8.1.sql
new file mode 100644
index 00000000000..21d60f15303
--- /dev/null
+++ b/scripts/database/create/create_v4.8.1.sql
@@ -0,0 +1,340 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.2.sql b/scripts/database/create/create_v4.8.2.sql
new file mode 100644
index 00000000000..f6051b043db
--- /dev/null
+++ b/scripts/database/create/create_v4.8.2.sql
@@ -0,0 +1,340 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.3.sql b/scripts/database/create/create_v4.8.3.sql
new file mode 100644
index 00000000000..e521804127b
--- /dev/null
+++ b/scripts/database/create/create_v4.8.3.sql
@@ -0,0 +1,342 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN VARCHAR(64), EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.4.sql b/scripts/database/create/create_v4.8.4.sql
new file mode 100644
index 00000000000..c8ade3cdd96
--- /dev/null
+++ b/scripts/database/create/create_v4.8.4.sql
@@ -0,0 +1,342 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.5.sql b/scripts/database/create/create_v4.8.5.sql
new file mode 100644
index 00000000000..95eb78a522b
--- /dev/null
+++ b/scripts/database/create/create_v4.8.5.sql
@@ -0,0 +1,343 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.6.sql b/scripts/database/create/create_v4.8.6.sql
new file mode 100644
index 00000000000..c6906d2f2b8
--- /dev/null
+++ b/scripts/database/create/create_v4.8.6.sql
@@ -0,0 +1,343 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.8.sql b/scripts/database/create/create_v4.8.sql
new file mode 100644
index 00000000000..21d60f15303
--- /dev/null
+++ b/scripts/database/create/create_v4.8.sql
@@ -0,0 +1,340 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), CREATEDATE TIMESTAMP NOT NULL, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, AUTHORITY VARCHAR(255), DOISEPARATOR VARCHAR(255), FILEACCESSREQUEST BOOLEAN, GLOBALIDCREATETIME TIMESTAMP, HARVESTIDENTIFIER VARCHAR(255), IDENTIFIER VARCHAR(255) NOT NULL, LASTEXPORTTIME TIMESTAMP, PROTOCOL VARCHAR(255), USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, USER_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE DATASET ADD CONSTRAINT UNQ_DATASET_0 UNIQUE (authority,protocol,identifier,doiseparator);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.9.1.sql b/scripts/database/create/create_v4.9.1.sql
new file mode 100644
index 00000000000..2e352351e5e
--- /dev/null
+++ b/scripts/database/create/create_v4.9.1.sql
@@ -0,0 +1,346 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), AUTHORITY VARCHAR(255), CREATEDATE TIMESTAMP NOT NULL, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PROTOCOL VARCHAR(255), PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE STORAGESITE (ID  SERIAL NOT NULL, hostname TEXT, name TEXT, PRIMARYSTORAGE BOOLEAN NOT NULL, transferProtocols TEXT, PRIMARY KEY (ID));
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE METRIC (ID  SERIAL NOT NULL, LASTCALLEDDATE TIMESTAMP NOT NULL, METRICNAME VARCHAR(255) NOT NULL UNIQUE, METRICVALUE TEXT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METRIC_id ON METRIC (id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, prov_freeform TEXT, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, FILEACCESSREQUEST BOOLEAN, HARVESTIDENTIFIER VARCHAR(255), LASTEXPORTTIME TIMESTAMP, USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, prov_entityname TEXT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DVOBJECT ADD CONSTRAINT UNQ_DVOBJECT_0 UNIQUE (authority,protocol,identifier);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.9.2.sql b/scripts/database/create/create_v4.9.2.sql
new file mode 100644
index 00000000000..1a3592de7a2
--- /dev/null
+++ b/scripts/database/create/create_v4.9.2.sql
@@ -0,0 +1,346 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), AUTHORITY VARCHAR(255), CREATEDATE TIMESTAMP NOT NULL, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PROTOCOL VARCHAR(255), PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE STORAGESITE (ID  SERIAL NOT NULL, hostname TEXT, name TEXT, PRIMARYSTORAGE BOOLEAN NOT NULL, transferProtocols TEXT, PRIMARY KEY (ID));
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE METRIC (ID  SERIAL NOT NULL, LASTCALLEDDATE TIMESTAMP NOT NULL, METRICNAME VARCHAR(255) NOT NULL UNIQUE, METRICVALUE TEXT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METRIC_id ON METRIC (id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, prov_freeform TEXT, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, FILEACCESSREQUEST BOOLEAN, HARVESTIDENTIFIER VARCHAR(255), LASTEXPORTTIME TIMESTAMP, USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), FORCETYPECHECK BOOLEAN, LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FACTOR BOOLEAN, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), PREVIOUSDATAFILEID BIGINT, prov_entityname TEXT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DVOBJECT ADD CONSTRAINT UNQ_DVOBJECT_0 UNIQUE (authority,protocol,identifier);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.9.3.sql b/scripts/database/create/create_v4.9.3.sql
new file mode 100644
index 00000000000..35950f24bff
--- /dev/null
+++ b/scripts/database/create/create_v4.9.3.sql
@@ -0,0 +1,348 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), AUTHORITY VARCHAR(255), CREATEDATE TIMESTAMP NOT NULL, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PROTOCOL VARCHAR(255), PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE STORAGESITE (ID  SERIAL NOT NULL, hostname TEXT, name TEXT, PRIMARYSTORAGE BOOLEAN NOT NULL, transferProtocols TEXT, PRIMARY KEY (ID));
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE METRIC (ID  SERIAL NOT NULL, LASTCALLEDDATE TIMESTAMP NOT NULL, METRICNAME VARCHAR(255) NOT NULL UNIQUE, METRICVALUE TEXT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METRIC_id ON METRIC (id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, prov_freeform TEXT, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, FILEACCESSREQUEST BOOLEAN, HARVESTIDENTIFIER VARCHAR(255), LASTEXPORTTIME TIMESTAMP, USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), FORCETYPECHECK BOOLEAN, LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FACTOR BOOLEAN, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), PREVIOUSDATAFILEID BIGINT, prov_entityname TEXT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, ENCRYPTEDPASSWORD VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_userName ON BUILTINUSER (userName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE ALTERNATIVEPERSISTENTIDENTIFIER (ID  SERIAL NOT NULL, AUTHORITY VARCHAR(255), GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, PROTOCOL VARCHAR(255), STORAGELOCATIONDESIGNATOR BOOLEAN, DVOBJECT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DVOBJECT ADD CONSTRAINT UNQ_DVOBJECT_0 UNIQUE (authority,protocol,identifier);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE ALTERNATIVEPERSISTENTIDENTIFIER ADD CONSTRAINT FK_ALTERNATIVEPERSISTENTIDENTIFIER_DVOBJECT_ID FOREIGN KEY (DVOBJECT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.9.4.sql b/scripts/database/create/create_v4.9.4.sql
new file mode 100644
index 00000000000..35950f24bff
--- /dev/null
+++ b/scripts/database/create/create_v4.9.4.sql
@@ -0,0 +1,348 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), AUTHORITY VARCHAR(255), CREATEDATE TIMESTAMP NOT NULL, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PROTOCOL VARCHAR(255), PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE STORAGESITE (ID  SERIAL NOT NULL, hostname TEXT, name TEXT, PRIMARYSTORAGE BOOLEAN NOT NULL, transferProtocols TEXT, PRIMARY KEY (ID));
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE METRIC (ID  SERIAL NOT NULL, LASTCALLEDDATE TIMESTAMP NOT NULL, METRICNAME VARCHAR(255) NOT NULL UNIQUE, METRICVALUE TEXT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METRIC_id ON METRIC (id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, prov_freeform TEXT, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, FILEACCESSREQUEST BOOLEAN, HARVESTIDENTIFIER VARCHAR(255), LASTEXPORTTIME TIMESTAMP, USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), FORCETYPECHECK BOOLEAN, LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FACTOR BOOLEAN, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), PREVIOUSDATAFILEID BIGINT, prov_entityname TEXT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, ENCRYPTEDPASSWORD VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_userName ON BUILTINUSER (userName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE ALTERNATIVEPERSISTENTIDENTIFIER (ID  SERIAL NOT NULL, AUTHORITY VARCHAR(255), GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, PROTOCOL VARCHAR(255), STORAGELOCATIONDESIGNATOR BOOLEAN, DVOBJECT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DVOBJECT ADD CONSTRAINT UNQ_DVOBJECT_0 UNIQUE (authority,protocol,identifier);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE ALTERNATIVEPERSISTENTIDENTIFIER ADD CONSTRAINT FK_ALTERNATIVEPERSISTENTIDENTIFIER_DVOBJECT_ID FOREIGN KEY (DVOBJECT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/create/create_v4.9.sql b/scripts/database/create/create_v4.9.sql
new file mode 100644
index 00000000000..2e352351e5e
--- /dev/null
+++ b/scripts/database/create/create_v4.9.sql
@@ -0,0 +1,346 @@
+CREATE TABLE DATAVERSETHEME (ID  SERIAL NOT NULL, BACKGROUNDCOLOR VARCHAR(255), LINKCOLOR VARCHAR(255), LINKURL VARCHAR(255), LOGO VARCHAR(255), LOGOALIGNMENT VARCHAR(255), LOGOBACKGROUNDCOLOR VARCHAR(255), LOGOFORMAT VARCHAR(255), TAGLINE VARCHAR(255), TEXTCOLOR VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSETHEME_dataverse_id ON DATAVERSETHEME (dataverse_id);
+CREATE TABLE DATAFILECATEGORY (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILECATEGORY_dataset_id ON DATAFILECATEGORY (dataset_id);
+CREATE TABLE ROLEASSIGNMENT (ID  SERIAL NOT NULL, ASSIGNEEIDENTIFIER VARCHAR(255) NOT NULL, PRIVATEURLTOKEN VARCHAR(255), DEFINITIONPOINT_ID BIGINT NOT NULL, ROLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_ROLEASSIGNMENT_assigneeidentifier ON ROLEASSIGNMENT (assigneeidentifier);
+CREATE INDEX INDEX_ROLEASSIGNMENT_definitionpoint_id ON ROLEASSIGNMENT (definitionpoint_id);
+CREATE INDEX INDEX_ROLEASSIGNMENT_role_id ON ROLEASSIGNMENT (role_id);
+CREATE TABLE WORKFLOW (ID  SERIAL NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE OAISET (ID  SERIAL NOT NULL, DEFINITION TEXT, DELETED BOOLEAN, DESCRIPTION TEXT, NAME TEXT, SPEC TEXT, UPDATEINPROGRESS BOOLEAN, VERSION BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DATAVERSELINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP, DATAVERSE_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_dataverse_id ON DATAVERSELINKINGDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSELINKINGDATAVERSE_linkingDataverse_id ON DATAVERSELINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE METADATABLOCK (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, owner_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METADATABLOCK_name ON METADATABLOCK (name);
+CREATE INDEX INDEX_METADATABLOCK_owner_id ON METADATABLOCK (owner_id);
+CREATE TABLE CONFIRMEMAILDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, TOKEN VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONFIRMEMAILDATA_token ON CONFIRMEMAILDATA (token);
+CREATE INDEX INDEX_CONFIRMEMAILDATA_authenticateduser_id ON CONFIRMEMAILDATA (authenticateduser_id);
+CREATE TABLE OAUTH2TOKENDATA (ID  SERIAL NOT NULL, ACCESSTOKEN TEXT, EXPIRYDATE TIMESTAMP, OAUTHPROVIDERID VARCHAR(255), RAWRESPONSE TEXT, REFRESHTOKEN VARCHAR(64), SCOPE VARCHAR(64), TOKENTYPE VARCHAR(32), USER_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE DVOBJECT (ID  SERIAL NOT NULL, DTYPE VARCHAR(31), AUTHORITY VARCHAR(255), CREATEDATE TIMESTAMP NOT NULL, GLOBALIDCREATETIME TIMESTAMP, IDENTIFIER VARCHAR(255), IDENTIFIERREGISTERED BOOLEAN, INDEXTIME TIMESTAMP, MODIFICATIONTIME TIMESTAMP NOT NULL, PERMISSIONINDEXTIME TIMESTAMP, PERMISSIONMODIFICATIONTIME TIMESTAMP, PREVIEWIMAGEAVAILABLE BOOLEAN, PROTOCOL VARCHAR(255), PUBLICATIONDATE TIMESTAMP, STORAGEIDENTIFIER VARCHAR(255), CREATOR_ID BIGINT, OWNER_ID BIGINT, RELEASEUSER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DVOBJECT_dtype ON DVOBJECT (dtype);
+CREATE INDEX INDEX_DVOBJECT_owner_id ON DVOBJECT (owner_id);
+CREATE INDEX INDEX_DVOBJECT_creator_id ON DVOBJECT (creator_id);
+CREATE INDEX INDEX_DVOBJECT_releaseuser_id ON DVOBJECT (releaseuser_id);
+CREATE TABLE DATAVERSE (ID BIGINT NOT NULL, AFFILIATION VARCHAR(255), ALIAS VARCHAR(255) NOT NULL UNIQUE, DATAVERSETYPE VARCHAR(255) NOT NULL, description TEXT, FACETROOT BOOLEAN, GUESTBOOKROOT BOOLEAN, METADATABLOCKROOT BOOLEAN, NAME VARCHAR(255) NOT NULL, PERMISSIONROOT BOOLEAN, TEMPLATEROOT BOOLEAN, THEMEROOT BOOLEAN, DEFAULTCONTRIBUTORROLE_ID BIGINT NOT NULL, DEFAULTTEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSE_defaultcontributorrole_id ON DATAVERSE (defaultcontributorrole_id);
+CREATE INDEX INDEX_DATAVERSE_defaulttemplate_id ON DATAVERSE (defaulttemplate_id);
+CREATE INDEX INDEX_DATAVERSE_alias ON DATAVERSE (alias);
+CREATE INDEX INDEX_DATAVERSE_affiliation ON DATAVERSE (affiliation);
+CREATE INDEX INDEX_DATAVERSE_dataversetype ON DATAVERSE (dataversetype);
+CREATE INDEX INDEX_DATAVERSE_facetroot ON DATAVERSE (facetroot);
+CREATE INDEX INDEX_DATAVERSE_guestbookroot ON DATAVERSE (guestbookroot);
+CREATE INDEX INDEX_DATAVERSE_metadatablockroot ON DATAVERSE (metadatablockroot);
+CREATE INDEX INDEX_DATAVERSE_templateroot ON DATAVERSE (templateroot);
+CREATE INDEX INDEX_DATAVERSE_permissionroot ON DATAVERSE (permissionroot);
+CREATE INDEX INDEX_DATAVERSE_themeroot ON DATAVERSE (themeroot);
+CREATE TABLE IPV6RANGE (ID BIGINT NOT NULL, BOTTOMA BIGINT, BOTTOMB BIGINT, BOTTOMC BIGINT, BOTTOMD BIGINT, TOPA BIGINT, TOPB BIGINT, TOPC BIGINT, TOPD BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV6RANGE_owner_id ON IPV6RANGE (owner_id);
+CREATE TABLE STORAGESITE (ID  SERIAL NOT NULL, hostname TEXT, name TEXT, PRIMARYSTORAGE BOOLEAN NOT NULL, transferProtocols TEXT, PRIMARY KEY (ID));
+CREATE TABLE SAVEDSEARCHFILTERQUERY (ID  SERIAL NOT NULL, FILTERQUERY TEXT, SAVEDSEARCH_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCHFILTERQUERY_savedsearch_id ON SAVEDSEARCHFILTERQUERY (savedsearch_id);
+CREATE TABLE DATAVERSEFACET (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFACET_dataverse_id ON DATAVERSEFACET (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFACET_datasetfieldtype_id ON DATAVERSEFACET (datasetfieldtype_id);
+CREATE INDEX INDEX_DATAVERSEFACET_displayorder ON DATAVERSEFACET (displayorder);
+CREATE TABLE OAIRECORD (ID  SERIAL NOT NULL, GLOBALID VARCHAR(255), LASTUPDATETIME TIMESTAMP, REMOVED BOOLEAN, SETNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE DATAVERSEFEATUREDDATAVERSE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, featureddataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_dataverse_id ON DATAVERSEFEATUREDDATAVERSE (dataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id ON DATAVERSEFEATUREDDATAVERSE (featureddataverse_id);
+CREATE INDEX INDEX_DATAVERSEFEATUREDDATAVERSE_displayorder ON DATAVERSEFEATUREDDATAVERSE (displayorder);
+CREATE TABLE HARVESTINGCLIENT (ID  SERIAL NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), DELETED BOOLEAN, HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGNOW BOOLEAN, HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), METADATAPREFIX VARCHAR(255), NAME VARCHAR(255) NOT NULL UNIQUE, SCHEDULEDAYOFWEEK INTEGER, SCHEDULEHOUROFDAY INTEGER, SCHEDULEPERIOD VARCHAR(255), SCHEDULED BOOLEAN, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGCLIENT_dataverse_id ON HARVESTINGCLIENT (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvesttype ON HARVESTINGCLIENT (harvesttype);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harveststyle ON HARVESTINGCLIENT (harveststyle);
+CREATE INDEX INDEX_HARVESTINGCLIENT_harvestingurl ON HARVESTINGCLIENT (harvestingurl);
+CREATE TABLE APITOKEN (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, DISABLED BOOLEAN NOT NULL, EXPIRETIME TIMESTAMP NOT NULL, TOKENSTRING VARCHAR(255) NOT NULL UNIQUE, AUTHENTICATEDUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_APITOKEN_authenticateduser_id ON APITOKEN (authenticateduser_id);
+CREATE TABLE DATASETFIELDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, value TEXT, DATASETFIELD_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDVALUE_datasetfield_id ON DATASETFIELDVALUE (datasetfield_id);
+CREATE TABLE CUSTOMQUESTION (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, HIDDEN BOOLEAN, QUESTIONSTRING VARCHAR(255) NOT NULL, QUESTIONTYPE VARCHAR(255) NOT NULL, REQUIRED BOOLEAN, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTION_guestbook_id ON CUSTOMQUESTION (guestbook_id);
+CREATE TABLE VARIABLERANGEITEM (ID  SERIAL NOT NULL, VALUE DECIMAL(38), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGEITEM_datavariable_id ON VARIABLERANGEITEM (datavariable_id);
+CREATE TABLE VARIABLERANGE (ID  SERIAL NOT NULL, BEGINVALUE VARCHAR(255), BEGINVALUETYPE INTEGER, ENDVALUE VARCHAR(255), ENDVALUETYPE INTEGER, DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLERANGE_datavariable_id ON VARIABLERANGE (datavariable_id);
+CREATE TABLE SHIBGROUP (ID  SERIAL NOT NULL, ATTRIBUTE VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, PATTERN VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE WORKFLOWCOMMENT (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, MESSAGE TEXT, TYPE VARCHAR(255) NOT NULL, AUTHENTICATEDUSER_ID BIGINT, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELD (ID  SERIAL NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, PARENTDATASETFIELDCOMPOUNDVALUE_ID BIGINT, TEMPLATE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELD_datasetfieldtype_id ON DATASETFIELD (datasetfieldtype_id);
+CREATE INDEX INDEX_DATASETFIELD_datasetversion_id ON DATASETFIELD (datasetversion_id);
+CREATE INDEX INDEX_DATASETFIELD_parentdatasetfieldcompoundvalue_id ON DATASETFIELD (parentdatasetfieldcompoundvalue_id);
+CREATE INDEX INDEX_DATASETFIELD_template_id ON DATASETFIELD (template_id);
+CREATE TABLE PERSISTEDGLOBALGROUP (ID BIGINT NOT NULL, DTYPE VARCHAR(31), DESCRIPTION VARCHAR(255), DISPLAYNAME VARCHAR(255), PERSISTEDGROUPALIAS VARCHAR(255) UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PERSISTEDGLOBALGROUP_dtype ON PERSISTEDGLOBALGROUP (dtype);
+CREATE TABLE IPV4RANGE (ID BIGINT NOT NULL, BOTTOMASLONG BIGINT, TOPASLONG BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_IPV4RANGE_owner_id ON IPV4RANGE (owner_id);
+CREATE TABLE DATASETVERSION (ID  SERIAL NOT NULL, UNF VARCHAR(255), ARCHIVENOTE VARCHAR(1000), ARCHIVETIME TIMESTAMP, CREATETIME TIMESTAMP NOT NULL, DEACCESSIONLINK VARCHAR(255), LASTUPDATETIME TIMESTAMP NOT NULL, MINORVERSIONNUMBER BIGINT, RELEASETIME TIMESTAMP, VERSION BIGINT, VERSIONNOTE VARCHAR(1000), VERSIONNUMBER BIGINT, VERSIONSTATE VARCHAR(255), DATASET_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSION_dataset_id ON DATASETVERSION (dataset_id);
+CREATE TABLE METRIC (ID  SERIAL NOT NULL, LASTCALLEDDATE TIMESTAMP NOT NULL, METRICNAME VARCHAR(255) NOT NULL UNIQUE, METRICVALUE TEXT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_METRIC_id ON METRIC (id);
+CREATE TABLE USERNOTIFICATION (ID  SERIAL NOT NULL, EMAILED BOOLEAN, OBJECTID BIGINT, READNOTIFICATION BOOLEAN, SENDDATE TIMESTAMP, TYPE INTEGER NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_USERNOTIFICATION_user_id ON USERNOTIFICATION (user_id);
+CREATE TABLE WORKFLOWSTEPDATA (ID  SERIAL NOT NULL, PROVIDERID VARCHAR(255), STEPTYPE VARCHAR(255), PARENT_ID BIGINT, index INTEGER, PRIMARY KEY (ID));
+CREATE TABLE CUSTOMFIELDMAP (ID  SERIAL NOT NULL, SOURCEDATASETFIELD VARCHAR(255), SOURCETEMPLATE VARCHAR(255), TARGETDATASETFIELD VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcedatasetfield ON CUSTOMFIELDMAP (sourcedatasetfield);
+CREATE INDEX INDEX_CUSTOMFIELDMAP_sourcetemplate ON CUSTOMFIELDMAP (sourcetemplate);
+CREATE TABLE GUESTBOOK (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, EMAILREQUIRED BOOLEAN, ENABLED BOOLEAN, INSTITUTIONREQUIRED BOOLEAN, NAME VARCHAR(255), NAMEREQUIRED BOOLEAN, POSITIONREQUIRED BOOLEAN, DATAVERSE_ID BIGINT, PRIMARY KEY (ID));
+CREATE TABLE ACTIONLOGRECORD (ID VARCHAR(36) NOT NULL, ACTIONRESULT VARCHAR(255), ACTIONSUBTYPE VARCHAR(255), ACTIONTYPE VARCHAR(255), ENDTIME TIMESTAMP, INFO VARCHAR(1024), STARTTIME TIMESTAMP, USERIDENTIFIER VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_ACTIONLOGRECORD_useridentifier ON ACTIONLOGRECORD (useridentifier);
+CREATE INDEX INDEX_ACTIONLOGRECORD_actiontype ON ACTIONLOGRECORD (actiontype);
+CREATE INDEX INDEX_ACTIONLOGRECORD_starttime ON ACTIONLOGRECORD (starttime);
+CREATE TABLE MAPLAYERMETADATA (ID  SERIAL NOT NULL, EMBEDMAPLINK VARCHAR(255) NOT NULL, ISJOINLAYER BOOLEAN, JOINDESCRIPTION TEXT, LASTVERIFIEDSTATUS INTEGER, LASTVERIFIEDTIME TIMESTAMP, LAYERLINK VARCHAR(255) NOT NULL, LAYERNAME VARCHAR(255) NOT NULL, MAPIMAGELINK VARCHAR(255), MAPLAYERLINKS TEXT, WORLDMAPUSERNAME VARCHAR(255) NOT NULL, DATASET_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_MAPLAYERMETADATA_dataset_id ON MAPLAYERMETADATA (dataset_id);
+CREATE TABLE SAVEDSEARCH (ID  SERIAL NOT NULL, QUERY TEXT, CREATOR_ID BIGINT NOT NULL, DEFINITIONPOINT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SAVEDSEARCH_definitionpoint_id ON SAVEDSEARCH (definitionpoint_id);
+CREATE INDEX INDEX_SAVEDSEARCH_creator_id ON SAVEDSEARCH (creator_id);
+CREATE TABLE EXPLICITGROUP (ID  SERIAL NOT NULL, DESCRIPTION VARCHAR(1024), DISPLAYNAME VARCHAR(255), GROUPALIAS VARCHAR(255) UNIQUE, GROUPALIASINOWNER VARCHAR(255), OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_EXPLICITGROUP_owner_id ON EXPLICITGROUP (owner_id);
+CREATE INDEX INDEX_EXPLICITGROUP_groupaliasinowner ON EXPLICITGROUP (groupaliasinowner);
+CREATE TABLE FOREIGNMETADATAFORMATMAPPING (ID  SERIAL NOT NULL, DISPLAYNAME VARCHAR(255) NOT NULL, NAME VARCHAR(255) NOT NULL, SCHEMALOCATION VARCHAR(255), STARTELEMENT VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFORMATMAPPING_name ON FOREIGNMETADATAFORMATMAPPING (name);
+CREATE TABLE EXTERNALTOOL (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DISPLAYNAME VARCHAR(255) NOT NULL, TOOLPARAMETERS VARCHAR(255) NOT NULL, TOOLURL VARCHAR(255) NOT NULL, TYPE VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE DATASETFIELDDEFAULTVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, STRVALUE TEXT, DATASETFIELD_ID BIGINT NOT NULL, DEFAULTVALUESET_ID BIGINT NOT NULL, PARENTDATASETFIELDDEFAULTVALUE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_datasetfield_id ON DATASETFIELDDEFAULTVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_defaultvalueset_id ON DATASETFIELDDEFAULTVALUE (defaultvalueset_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_parentdatasetfielddefaultvalue_id ON DATASETFIELDDEFAULTVALUE (parentdatasetfielddefaultvalue_id);
+CREATE INDEX INDEX_DATASETFIELDDEFAULTVALUE_displayorder ON DATASETFIELDDEFAULTVALUE (displayorder);
+CREATE TABLE PENDINGWORKFLOWINVOCATION (INVOCATIONID VARCHAR(255) NOT NULL, DOIPROVIDER VARCHAR(255), IPADDRESS VARCHAR(255), NEXTMINORVERSIONNUMBER BIGINT, NEXTVERSIONNUMBER BIGINT, PENDINGSTEPIDX INTEGER, TYPEORDINAL INTEGER, USERID VARCHAR(255), WORKFLOW_ID BIGINT, DATASET_ID BIGINT, PRIMARY KEY (INVOCATIONID));
+CREATE TABLE DEFAULTVALUESET (ID  SERIAL NOT NULL, NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE AUTHENTICATEDUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), CREATEDTIME TIMESTAMP NOT NULL, EMAIL VARCHAR(255) NOT NULL UNIQUE, EMAILCONFIRMED TIMESTAMP, FIRSTNAME VARCHAR(255), LASTAPIUSETIME TIMESTAMP, LASTLOGINTIME TIMESTAMP, LASTNAME VARCHAR(255), POSITION VARCHAR(255), SUPERUSER BOOLEAN, USERIDENTIFIER VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE DATATABLE (ID  SERIAL NOT NULL, CASEQUANTITY BIGINT, ORIGINALFILEFORMAT VARCHAR(255), ORIGINALFORMATVERSION VARCHAR(255), RECORDSPERCASE BIGINT, UNF VARCHAR(255) NOT NULL, VARQUANTITY BIGINT, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATATABLE_datafile_id ON DATATABLE (datafile_id);
+CREATE TABLE INGESTREPORT (ID  SERIAL NOT NULL, ENDTIME TIMESTAMP, REPORT TEXT, STARTTIME TIMESTAMP, STATUS INTEGER, TYPE INTEGER, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREPORT_datafile_id ON INGESTREPORT (datafile_id);
+CREATE TABLE AUTHENTICATIONPROVIDERROW (ID VARCHAR(255) NOT NULL, ENABLED BOOLEAN, FACTORYALIAS VARCHAR(255), FACTORYDATA TEXT, SUBTITLE VARCHAR(255), TITLE VARCHAR(255), PRIMARY KEY (ID));
+CREATE INDEX INDEX_AUTHENTICATIONPROVIDERROW_enabled ON AUTHENTICATIONPROVIDERROW (enabled);
+CREATE TABLE FOREIGNMETADATAFIELDMAPPING (ID  SERIAL NOT NULL, datasetfieldName TEXT, foreignFieldXPath TEXT, ISATTRIBUTE BOOLEAN, FOREIGNMETADATAFORMATMAPPING_ID BIGINT, PARENTFIELDMAPPING_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignmetadataformatmapping_id ON FOREIGNMETADATAFIELDMAPPING (foreignmetadataformatmapping_id);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_foreignfieldxpath ON FOREIGNMETADATAFIELDMAPPING (foreignfieldxpath);
+CREATE INDEX INDEX_FOREIGNMETADATAFIELDMAPPING_parentfieldmapping_id ON FOREIGNMETADATAFIELDMAPPING (parentfieldmapping_id);
+CREATE TABLE FILEMETADATA (ID  SERIAL NOT NULL, DESCRIPTION TEXT, DIRECTORYLABEL VARCHAR(255), LABEL VARCHAR(255) NOT NULL, prov_freeform TEXT, RESTRICTED BOOLEAN, VERSION BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_FILEMETADATA_datafile_id ON FILEMETADATA (datafile_id);
+CREATE INDEX INDEX_FILEMETADATA_datasetversion_id ON FILEMETADATA (datasetversion_id);
+CREATE TABLE CUSTOMQUESTIONVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, VALUESTRING VARCHAR(255) NOT NULL, CUSTOMQUESTION_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE SUMMARYSTATISTIC (ID  SERIAL NOT NULL, TYPE INTEGER, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_SUMMARYSTATISTIC_datavariable_id ON SUMMARYSTATISTIC (datavariable_id);
+CREATE TABLE worldmapauth_token (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, HASEXPIRED BOOLEAN NOT NULL, LASTREFRESHTIME TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL, TOKEN VARCHAR(255), APPLICATION_ID BIGINT NOT NULL, DATAFILE_ID BIGINT NOT NULL, DATAVERSEUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX token_value ON worldmapauth_token (token);
+CREATE INDEX INDEX_worldmapauth_token_application_id ON worldmapauth_token (application_id);
+CREATE INDEX INDEX_worldmapauth_token_datafile_id ON worldmapauth_token (datafile_id);
+CREATE INDEX INDEX_worldmapauth_token_dataverseuser_id ON worldmapauth_token (dataverseuser_id);
+CREATE TABLE PASSWORDRESETDATA (ID  SERIAL NOT NULL, CREATED TIMESTAMP NOT NULL, EXPIRES TIMESTAMP NOT NULL, REASON VARCHAR(255), TOKEN VARCHAR(255), BUILTINUSER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_PASSWORDRESETDATA_token ON PASSWORDRESETDATA (token);
+CREATE INDEX INDEX_PASSWORDRESETDATA_builtinuser_id ON PASSWORDRESETDATA (builtinuser_id);
+CREATE TABLE CONTROLLEDVOCABULARYVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, IDENTIFIER VARCHAR(255), STRVALUE TEXT, DATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_datasetfieldtype_id ON CONTROLLEDVOCABULARYVALUE (datasetfieldtype_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABULARYVALUE_displayorder ON CONTROLLEDVOCABULARYVALUE (displayorder);
+CREATE TABLE DATASETLINKINGDATAVERSE (ID  SERIAL NOT NULL, LINKCREATETIME TIMESTAMP NOT NULL, DATASET_ID BIGINT NOT NULL, LINKINGDATAVERSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_dataset_id ON DATASETLINKINGDATAVERSE (dataset_id);
+CREATE INDEX INDEX_DATASETLINKINGDATAVERSE_linkingDataverse_id ON DATASETLINKINGDATAVERSE (linkingDataverse_id);
+CREATE TABLE DATASET (ID BIGINT NOT NULL, FILEACCESSREQUEST BOOLEAN, HARVESTIDENTIFIER VARCHAR(255), LASTEXPORTTIME TIMESTAMP, USEGENERICTHUMBNAIL BOOLEAN, citationDateDatasetFieldType_id BIGINT, harvestingClient_id BIGINT, guestbook_id BIGINT, thumbnailfile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASET_guestbook_id ON DATASET (guestbook_id);
+CREATE INDEX INDEX_DATASET_thumbnailfile_id ON DATASET (thumbnailfile_id);
+CREATE TABLE CLIENTHARVESTRUN (ID  SERIAL NOT NULL, DELETEDDATASETCOUNT BIGINT, FAILEDDATASETCOUNT BIGINT, FINISHTIME TIMESTAMP, HARVESTRESULT INTEGER, HARVESTEDDATASETCOUNT BIGINT, STARTTIME TIMESTAMP, HARVESTINGCLIENT_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE TABLE worldmapauth_tokentype (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255), CREATED TIMESTAMP NOT NULL, HOSTNAME VARCHAR(255), IPADDRESS VARCHAR(255), MAPITLINK VARCHAR(255) NOT NULL, MD5 VARCHAR(255) NOT NULL, MODIFIED TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, timeLimitMinutes int default 30, timeLimitSeconds bigint default 1800, PRIMARY KEY (ID));
+CREATE UNIQUE INDEX application_name ON worldmapauth_tokentype (name);
+CREATE TABLE DATAFILETAG (ID  SERIAL NOT NULL, TYPE INTEGER NOT NULL, DATAFILE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILETAG_datafile_id ON DATAFILETAG (datafile_id);
+CREATE TABLE AUTHENTICATEDUSERLOOKUP (ID  SERIAL NOT NULL, AUTHENTICATIONPROVIDERID VARCHAR(255), PERSISTENTUSERID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE TABLE INGESTREQUEST (ID  SERIAL NOT NULL, CONTROLCARD VARCHAR(255), LABELSFILE VARCHAR(255), TEXTENCODING VARCHAR(255), datafile_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_INGESTREQUEST_datafile_id ON INGESTREQUEST (datafile_id);
+CREATE TABLE SETTING (NAME VARCHAR(255) NOT NULL, CONTENT TEXT, PRIMARY KEY (NAME));
+CREATE TABLE DATAVERSECONTACT (ID  SERIAL NOT NULL, CONTACTEMAIL VARCHAR(255) NOT NULL, DISPLAYORDER INTEGER, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSECONTACT_dataverse_id ON DATAVERSECONTACT (dataverse_id);
+CREATE INDEX INDEX_DATAVERSECONTACT_contactemail ON DATAVERSECONTACT (contactemail);
+CREATE INDEX INDEX_DATAVERSECONTACT_displayorder ON DATAVERSECONTACT (displayorder);
+CREATE TABLE VARIABLECATEGORY (ID  SERIAL NOT NULL, CATORDER INTEGER, FREQUENCY FLOAT, LABEL VARCHAR(255), MISSING BOOLEAN, VALUE VARCHAR(255), DATAVARIABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_VARIABLECATEGORY_datavariable_id ON VARIABLECATEGORY (datavariable_id);
+CREATE TABLE DATAVARIABLE (ID  SERIAL NOT NULL, FILEENDPOSITION BIGINT, FILEORDER INTEGER, FILESTARTPOSITION BIGINT, FORMAT VARCHAR(255), FORMATCATEGORY VARCHAR(255), INTERVAL INTEGER, LABEL TEXT, NAME VARCHAR(255), NUMBEROFDECIMALPOINTS BIGINT, ORDEREDFACTOR BOOLEAN, RECORDSEGMENTNUMBER BIGINT, TYPE INTEGER, UNF VARCHAR(255), UNIVERSE VARCHAR(255), WEIGHTED BOOLEAN, DATATABLE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVARIABLE_datatable_id ON DATAVARIABLE (datatable_id);
+CREATE TABLE CONTROLLEDVOCABALTERNATE (ID  SERIAL NOT NULL, STRVALUE TEXT, CONTROLLEDVOCABULARYVALUE_ID BIGINT NOT NULL, DATASETFIELDTYPE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_controlledvocabularyvalue_id ON CONTROLLEDVOCABALTERNATE (controlledvocabularyvalue_id);
+CREATE INDEX INDEX_CONTROLLEDVOCABALTERNATE_datasetfieldtype_id ON CONTROLLEDVOCABALTERNATE (datasetfieldtype_id);
+CREATE TABLE DATAFILE (ID BIGINT NOT NULL, CHECKSUMTYPE VARCHAR(255) NOT NULL, CHECKSUMVALUE VARCHAR(255) NOT NULL, CONTENTTYPE VARCHAR(255) NOT NULL, FILESIZE BIGINT, INGESTSTATUS CHAR(1), NAME VARCHAR(255), PREVIOUSDATAFILEID BIGINT, prov_entityname TEXT, RESTRICTED BOOLEAN, ROOTDATAFILEID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAFILE_ingeststatus ON DATAFILE (ingeststatus);
+CREATE INDEX INDEX_DATAFILE_checksumvalue ON DATAFILE (checksumvalue);
+CREATE INDEX INDEX_DATAFILE_contenttype ON DATAFILE (contenttype);
+CREATE INDEX INDEX_DATAFILE_restricted ON DATAFILE (restricted);
+CREATE TABLE DataverseFieldTypeInputLevel (ID  SERIAL NOT NULL, INCLUDE BOOLEAN, REQUIRED BOOLEAN, datasetfieldtype_id BIGINT, dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_dataverse_id ON DataverseFieldTypeInputLevel (dataverse_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_datasetfieldtype_id ON DataverseFieldTypeInputLevel (datasetfieldtype_id);
+CREATE INDEX INDEX_DataverseFieldTypeInputLevel_required ON DataverseFieldTypeInputLevel (required);
+CREATE TABLE BUILTINUSER (ID  SERIAL NOT NULL, AFFILIATION VARCHAR(255), EMAIL VARCHAR(255) NOT NULL UNIQUE, ENCRYPTEDPASSWORD VARCHAR(255), FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PASSWORDENCRYPTIONVERSION INTEGER, POSITION VARCHAR(255), USERNAME VARCHAR(255) NOT NULL UNIQUE, PRIMARY KEY (ID));
+CREATE INDEX INDEX_BUILTINUSER_lastName ON BUILTINUSER (lastName);
+CREATE TABLE TERMSOFUSEANDACCESS (ID  SERIAL NOT NULL, AVAILABILITYSTATUS TEXT, CITATIONREQUIREMENTS TEXT, CONDITIONS TEXT, CONFIDENTIALITYDECLARATION TEXT, CONTACTFORACCESS TEXT, DATAACCESSPLACE TEXT, DEPOSITORREQUIREMENTS TEXT, DISCLAIMER TEXT, FILEACCESSREQUEST BOOLEAN, LICENSE VARCHAR(255), ORIGINALARCHIVE TEXT, RESTRICTIONS TEXT, SIZEOFCOLLECTION TEXT, SPECIALPERMISSIONS TEXT, STUDYCOMPLETION TEXT, TERMSOFACCESS TEXT, TERMSOFUSE TEXT, PRIMARY KEY (ID));
+CREATE TABLE DOIDATACITEREGISTERCACHE (ID  SERIAL NOT NULL, DOI VARCHAR(255) UNIQUE, STATUS VARCHAR(255), URL VARCHAR(255), XML TEXT, PRIMARY KEY (ID));
+CREATE TABLE HARVESTINGDATAVERSECONFIG (ID BIGINT NOT NULL, ARCHIVEDESCRIPTION TEXT, ARCHIVEURL VARCHAR(255), HARVESTSTYLE VARCHAR(255), HARVESTTYPE VARCHAR(255), HARVESTINGSET VARCHAR(255), HARVESTINGURL VARCHAR(255), dataverse_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_dataverse_id ON HARVESTINGDATAVERSECONFIG (dataverse_id);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvesttype ON HARVESTINGDATAVERSECONFIG (harvesttype);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harveststyle ON HARVESTINGDATAVERSECONFIG (harveststyle);
+CREATE INDEX INDEX_HARVESTINGDATAVERSECONFIG_harvestingurl ON HARVESTINGDATAVERSECONFIG (harvestingurl);
+CREATE TABLE DATASETFIELDCOMPOUNDVALUE (ID  SERIAL NOT NULL, DISPLAYORDER INTEGER, PARENTDATASETFIELD_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDCOMPOUNDVALUE_parentdatasetfield_id ON DATASETFIELDCOMPOUNDVALUE (parentdatasetfield_id);
+CREATE TABLE DATASETVERSIONUSER (ID  SERIAL NOT NULL, LASTUPDATEDATE TIMESTAMP NOT NULL, authenticatedUser_id BIGINT, datasetversion_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETVERSIONUSER_authenticateduser_id ON DATASETVERSIONUSER (authenticateduser_id);
+CREATE INDEX INDEX_DATASETVERSIONUSER_datasetversion_id ON DATASETVERSIONUSER (datasetversion_id);
+CREATE TABLE GUESTBOOKRESPONSE (ID  SERIAL NOT NULL, DOWNLOADTYPE VARCHAR(255), EMAIL VARCHAR(255), INSTITUTION VARCHAR(255), NAME VARCHAR(255), POSITION VARCHAR(255), RESPONSETIME TIMESTAMP, SESSIONID VARCHAR(255), AUTHENTICATEDUSER_ID BIGINT, DATAFILE_ID BIGINT NOT NULL, DATASET_ID BIGINT NOT NULL, DATASETVERSION_ID BIGINT, GUESTBOOK_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_guestbook_id ON GUESTBOOKRESPONSE (guestbook_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_datafile_id ON GUESTBOOKRESPONSE (datafile_id);
+CREATE INDEX INDEX_GUESTBOOKRESPONSE_dataset_id ON GUESTBOOKRESPONSE (dataset_id);
+CREATE TABLE CUSTOMQUESTIONRESPONSE (ID  SERIAL NOT NULL, response TEXT, CUSTOMQUESTION_ID BIGINT NOT NULL, GUESTBOOKRESPONSE_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_CUSTOMQUESTIONRESPONSE_guestbookresponse_id ON CUSTOMQUESTIONRESPONSE (guestbookresponse_id);
+CREATE TABLE TEMPLATE (ID  SERIAL NOT NULL, CREATETIME TIMESTAMP NOT NULL, NAME VARCHAR(255) NOT NULL, USAGECOUNT BIGINT, DATAVERSE_ID BIGINT, termsOfUseAndAccess_id BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_TEMPLATE_dataverse_id ON TEMPLATE (dataverse_id);
+CREATE TABLE DATASETLOCK (ID  SERIAL NOT NULL, INFO VARCHAR(255), REASON VARCHAR(255) NOT NULL, STARTTIME TIMESTAMP, DATASET_ID BIGINT NOT NULL, USER_ID BIGINT NOT NULL, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETLOCK_user_id ON DATASETLOCK (user_id);
+CREATE INDEX INDEX_DATASETLOCK_dataset_id ON DATASETLOCK (dataset_id);
+CREATE TABLE DATAVERSEROLE (ID  SERIAL NOT NULL, ALIAS VARCHAR(255) NOT NULL UNIQUE, DESCRIPTION VARCHAR(255), NAME VARCHAR(255) NOT NULL, PERMISSIONBITS BIGINT, OWNER_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATAVERSEROLE_owner_id ON DATAVERSEROLE (owner_id);
+CREATE INDEX INDEX_DATAVERSEROLE_name ON DATAVERSEROLE (name);
+CREATE INDEX INDEX_DATAVERSEROLE_alias ON DATAVERSEROLE (alias);
+CREATE TABLE DATASETFIELDTYPE (ID  SERIAL NOT NULL, ADVANCEDSEARCHFIELDTYPE BOOLEAN, ALLOWCONTROLLEDVOCABULARY BOOLEAN, ALLOWMULTIPLES BOOLEAN, description TEXT, DISPLAYFORMAT VARCHAR(255), DISPLAYONCREATE BOOLEAN, DISPLAYORDER INTEGER, FACETABLE BOOLEAN, FIELDTYPE VARCHAR(255) NOT NULL, name TEXT, REQUIRED BOOLEAN, title TEXT, VALIDATIONFORMAT VARCHAR(255), WATERMARK VARCHAR(255), METADATABLOCK_ID BIGINT, PARENTDATASETFIELDTYPE_ID BIGINT, PRIMARY KEY (ID));
+CREATE INDEX INDEX_DATASETFIELDTYPE_metadatablock_id ON DATASETFIELDTYPE (metadatablock_id);
+CREATE INDEX INDEX_DATASETFIELDTYPE_parentdatasetfieldtype_id ON DATASETFIELDTYPE (parentdatasetfieldtype_id);
+CREATE TABLE FILEMETADATA_DATAFILECATEGORY (fileCategories_ID BIGINT NOT NULL, fileMetadatas_ID BIGINT NOT NULL, PRIMARY KEY (fileCategories_ID, fileMetadatas_ID));
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filecategories_id ON FILEMETADATA_DATAFILECATEGORY (filecategories_id);
+CREATE INDEX INDEX_FILEMETADATA_DATAFILECATEGORY_filemetadatas_id ON FILEMETADATA_DATAFILECATEGORY (filemetadatas_id);
+CREATE TABLE dataverse_citationDatasetFieldTypes (dataverse_id BIGINT NOT NULL, citationdatasetfieldtype_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, citationdatasetfieldtype_id));
+CREATE TABLE dataversesubjects (dataverse_id BIGINT NOT NULL, controlledvocabularyvalue_id BIGINT NOT NULL, PRIMARY KEY (dataverse_id, controlledvocabularyvalue_id));
+CREATE TABLE DATAVERSE_METADATABLOCK (Dataverse_ID BIGINT NOT NULL, metadataBlocks_ID BIGINT NOT NULL, PRIMARY KEY (Dataverse_ID, metadataBlocks_ID));
+CREATE TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE (DatasetField_ID BIGINT NOT NULL, controlledVocabularyValues_ID BIGINT NOT NULL, PRIMARY KEY (DatasetField_ID, controlledVocabularyValues_ID));
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_datasetfield_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (datasetfield_id);
+CREATE INDEX INDEX_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_controlledvocabularyvalues_id ON DATASETFIELD_CONTROLLEDVOCABULARYVALUE (controlledvocabularyvalues_id);
+CREATE TABLE WorkflowStepData_STEPPARAMETERS (WorkflowStepData_ID BIGINT, STEPPARAMETERS VARCHAR(2048), STEPPARAMETERS_KEY VARCHAR(255));
+CREATE TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES (ExplicitGroup_ID BIGINT, CONTAINEDROLEASSIGNEES VARCHAR(255));
+CREATE TABLE EXPLICITGROUP_AUTHENTICATEDUSER (ExplicitGroup_ID BIGINT NOT NULL, containedAuthenticatedUsers_ID BIGINT NOT NULL, PRIMARY KEY (ExplicitGroup_ID, containedAuthenticatedUsers_ID));
+CREATE TABLE explicitgroup_explicitgroup (explicitgroup_id BIGINT NOT NULL, containedexplicitgroups_id BIGINT NOT NULL, PRIMARY KEY (explicitgroup_id, containedexplicitgroups_id));
+CREATE TABLE PendingWorkflowInvocation_LOCALDATA (PendingWorkflowInvocation_INVOCATIONID VARCHAR(255), LOCALDATA VARCHAR(255), LOCALDATA_KEY VARCHAR(255));
+CREATE TABLE fileaccessrequests (datafile_id BIGINT NOT NULL, authenticated_user_id BIGINT NOT NULL, PRIMARY KEY (datafile_id, authenticated_user_id));
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT UNQ_ROLEASSIGNMENT_0 UNIQUE (assigneeIdentifier, role_id, definitionPoint_id);
+ALTER TABLE DVOBJECT ADD CONSTRAINT UNQ_DVOBJECT_0 UNIQUE (authority,protocol,identifier);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT UNQ_DATASETVERSION_0 UNIQUE (dataset_id,versionnumber,minorversionnumber);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT UNQ_FOREIGNMETADATAFIELDMAPPING_0 UNIQUE (foreignMetadataFormatMapping_id, foreignFieldXpath);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT UNQ_AUTHENTICATEDUSERLOOKUP_0 UNIQUE (persistentuserid, authenticationproviderid);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT UNQ_DataverseFieldTypeInputLevel_0 UNIQUE (dataverse_id, datasetfieldtype_id);
+ALTER TABLE DATAVERSETHEME ADD CONSTRAINT FK_DATAVERSETHEME_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAFILECATEGORY ADD CONSTRAINT FK_DATAFILECATEGORY_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_ROLE_ID FOREIGN KEY (ROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE ROLEASSIGNMENT ADD CONSTRAINT FK_ROLEASSIGNMENT_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSELINKINGDATAVERSE ADD CONSTRAINT FK_DATAVERSELINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE METADATABLOCK ADD CONSTRAINT FK_METADATABLOCK_owner_id FOREIGN KEY (owner_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE CONFIRMEMAILDATA ADD CONSTRAINT FK_CONFIRMEMAILDATA_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE OAUTH2TOKENDATA ADD CONSTRAINT FK_OAUTH2TOKENDATA_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_RELEASEUSER_ID FOREIGN KEY (RELEASEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DVOBJECT ADD CONSTRAINT FK_DVOBJECT_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTTEMPLATE_ID FOREIGN KEY (DEFAULTTEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE ADD CONSTRAINT FK_DATAVERSE_DEFAULTCONTRIBUTORROLE_ID FOREIGN KEY (DEFAULTCONTRIBUTORROLE_ID) REFERENCES DATAVERSEROLE (ID);
+ALTER TABLE IPV6RANGE ADD CONSTRAINT FK_IPV6RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE SAVEDSEARCHFILTERQUERY ADD CONSTRAINT FK_SAVEDSEARCHFILTERQUERY_SAVEDSEARCH_ID FOREIGN KEY (SAVEDSEARCH_ID) REFERENCES SAVEDSEARCH (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATAVERSEFACET ADD CONSTRAINT FK_DATAVERSEFACET_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSEFEATUREDDATAVERSE ADD CONSTRAINT FK_DATAVERSEFEATUREDDATAVERSE_featureddataverse_id FOREIGN KEY (featureddataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGCLIENT ADD CONSTRAINT FK_HARVESTINGCLIENT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE APITOKEN ADD CONSTRAINT FK_APITOKEN_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETFIELDVALUE ADD CONSTRAINT FK_DATASETFIELDVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE CUSTOMQUESTION ADD CONSTRAINT FK_CUSTOMQUESTION_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE VARIABLERANGEITEM ADD CONSTRAINT FK_VARIABLERANGEITEM_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE VARIABLERANGE ADD CONSTRAINT FK_VARIABLERANGE_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWCOMMENT ADD CONSTRAINT FK_WORKFLOWCOMMENT_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_TEMPLATE_ID FOREIGN KEY (TEMPLATE_ID) REFERENCES TEMPLATE (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE DATASETFIELD ADD CONSTRAINT FK_DATASETFIELD_PARENTDATASETFIELDCOMPOUNDVALUE_ID FOREIGN KEY (PARENTDATASETFIELDCOMPOUNDVALUE_ID) REFERENCES DATASETFIELDCOMPOUNDVALUE (ID);
+ALTER TABLE IPV4RANGE ADD CONSTRAINT FK_IPV4RANGE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES PERSISTEDGLOBALGROUP (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETVERSION ADD CONSTRAINT FK_DATASETVERSION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE USERNOTIFICATION ADD CONSTRAINT FK_USERNOTIFICATION_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE WORKFLOWSTEPDATA ADD CONSTRAINT FK_WORKFLOWSTEPDATA_PARENT_ID FOREIGN KEY (PARENT_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE GUESTBOOK ADD CONSTRAINT FK_GUESTBOOK_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE MAPLAYERMETADATA ADD CONSTRAINT FK_MAPLAYERMETADATA_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_DEFINITIONPOINT_ID FOREIGN KEY (DEFINITIONPOINT_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE SAVEDSEARCH ADD CONSTRAINT FK_SAVEDSEARCH_CREATOR_ID FOREIGN KEY (CREATOR_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE EXPLICITGROUP ADD CONSTRAINT FK_EXPLICITGROUP_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DEFAULTVALUESET_ID FOREIGN KEY (DEFAULTVALUESET_ID) REFERENCES DEFAULTVALUESET (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_DATASETFIELD_ID FOREIGN KEY (DATASETFIELD_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDDEFAULTVALUE ADD CONSTRAINT FK_DATASETFIELDDEFAULTVALUE_PARENTDATASETFIELDDEFAULTVALUE_ID FOREIGN KEY (PARENTDATASETFIELDDEFAULTVALUE_ID) REFERENCES DATASETFIELDDEFAULTVALUE (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_WORKFLOW_ID FOREIGN KEY (WORKFLOW_ID) REFERENCES WORKFLOW (ID);
+ALTER TABLE PENDINGWORKFLOWINVOCATION ADD CONSTRAINT FK_PENDINGWORKFLOWINVOCATION_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATATABLE ADD CONSTRAINT FK_DATATABLE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE INGESTREPORT ADD CONSTRAINT FK_INGESTREPORT_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_FOREIGNMETADATAFORMATMAPPING_ID FOREIGN KEY (FOREIGNMETADATAFORMATMAPPING_ID) REFERENCES FOREIGNMETADATAFORMATMAPPING (ID);
+ALTER TABLE FOREIGNMETADATAFIELDMAPPING ADD CONSTRAINT FK_FOREIGNMETADATAFIELDMAPPING_PARENTFIELDMAPPING_ID FOREIGN KEY (PARENTFIELDMAPPING_ID) REFERENCES FOREIGNMETADATAFIELDMAPPING (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE FILEMETADATA ADD CONSTRAINT FK_FILEMETADATA_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONVALUE ADD CONSTRAINT FK_CUSTOMQUESTIONVALUE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE SUMMARYSTATISTIC ADD CONSTRAINT FK_SUMMARYSTATISTIC_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAVERSEUSER_ID FOREIGN KEY (DATAVERSEUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE worldmapauth_token ADD CONSTRAINT FK_worldmapauth_token_APPLICATION_ID FOREIGN KEY (APPLICATION_ID) REFERENCES worldmapauth_tokentype (ID);
+ALTER TABLE PASSWORDRESETDATA ADD CONSTRAINT FK_PASSWORDRESETDATA_BUILTINUSER_ID FOREIGN KEY (BUILTINUSER_ID) REFERENCES BUILTINUSER (ID);
+ALTER TABLE CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_CONTROLLEDVOCABULARYVALUE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLINKINGDATAVERSE ADD CONSTRAINT FK_DATASETLINKINGDATAVERSE_LINKINGDATAVERSE_ID FOREIGN KEY (LINKINGDATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_harvestingClient_id FOREIGN KEY (harvestingClient_id) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_guestbook_id FOREIGN KEY (guestbook_id) REFERENCES GUESTBOOK (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_thumbnailfile_id FOREIGN KEY (thumbnailfile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASET ADD CONSTRAINT FK_DATASET_citationDateDatasetFieldType_id FOREIGN KEY (citationDateDatasetFieldType_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CLIENTHARVESTRUN ADD CONSTRAINT FK_CLIENTHARVESTRUN_HARVESTINGCLIENT_ID FOREIGN KEY (HARVESTINGCLIENT_ID) REFERENCES HARVESTINGCLIENT (ID);
+ALTER TABLE DATAFILETAG ADD CONSTRAINT FK_DATAFILETAG_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE AUTHENTICATEDUSERLOOKUP ADD CONSTRAINT FK_AUTHENTICATEDUSERLOOKUP_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE INGESTREQUEST ADD CONSTRAINT FK_INGESTREQUEST_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSECONTACT ADD CONSTRAINT FK_DATAVERSECONTACT_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE VARIABLECATEGORY ADD CONSTRAINT FK_VARIABLECATEGORY_DATAVARIABLE_ID FOREIGN KEY (DATAVARIABLE_ID) REFERENCES DATAVARIABLE (ID);
+ALTER TABLE DATAVARIABLE ADD CONSTRAINT FK_DATAVARIABLE_DATATABLE_ID FOREIGN KEY (DATATABLE_ID) REFERENCES DATATABLE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_DATASETFIELDTYPE_ID FOREIGN KEY (DATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE CONTROLLEDVOCABALTERNATE ADD CONSTRAINT FK_CONTROLLEDVOCABALTERNATE_CONTROLLEDVOCABULARYVALUE_ID FOREIGN KEY (CONTROLLEDVOCABULARYVALUE_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAFILE ADD CONSTRAINT FK_DATAFILE_ID FOREIGN KEY (ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_datasetfieldtype_id FOREIGN KEY (datasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DataverseFieldTypeInputLevel ADD CONSTRAINT FK_DataverseFieldTypeInputLevel_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE HARVESTINGDATAVERSECONFIG ADD CONSTRAINT FK_HARVESTINGDATAVERSECONFIG_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDCOMPOUNDVALUE ADD CONSTRAINT FK_DATASETFIELDCOMPOUNDVALUE_PARENTDATASETFIELD_ID FOREIGN KEY (PARENTDATASETFIELD_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_authenticatedUser_id FOREIGN KEY (authenticatedUser_id) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATASETVERSIONUSER ADD CONSTRAINT FK_DATASETVERSIONUSER_datasetversion_id FOREIGN KEY (datasetversion_id) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATAFILE_ID FOREIGN KEY (DATAFILE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASETVERSION_ID FOREIGN KEY (DATASETVERSION_ID) REFERENCES DATASETVERSION (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_GUESTBOOK_ID FOREIGN KEY (GUESTBOOK_ID) REFERENCES GUESTBOOK (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_AUTHENTICATEDUSER_ID FOREIGN KEY (AUTHENTICATEDUSER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE GUESTBOOKRESPONSE ADD CONSTRAINT FK_GUESTBOOKRESPONSE_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_CUSTOMQUESTION_ID FOREIGN KEY (CUSTOMQUESTION_ID) REFERENCES CUSTOMQUESTION (ID);
+ALTER TABLE CUSTOMQUESTIONRESPONSE ADD CONSTRAINT FK_CUSTOMQUESTIONRESPONSE_GUESTBOOKRESPONSE_ID FOREIGN KEY (GUESTBOOKRESPONSE_ID) REFERENCES GUESTBOOKRESPONSE (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_DATAVERSE_ID FOREIGN KEY (DATAVERSE_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE TEMPLATE ADD CONSTRAINT FK_TEMPLATE_termsOfUseAndAccess_id FOREIGN KEY (termsOfUseAndAccess_id) REFERENCES TERMSOFUSEANDACCESS (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_DATASET_ID FOREIGN KEY (DATASET_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETLOCK ADD CONSTRAINT FK_DATASETLOCK_USER_ID FOREIGN KEY (USER_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE DATAVERSEROLE ADD CONSTRAINT FK_DATAVERSEROLE_OWNER_ID FOREIGN KEY (OWNER_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_PARENTDATASETFIELDTYPE_ID FOREIGN KEY (PARENTDATASETFIELDTYPE_ID) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE DATASETFIELDTYPE ADD CONSTRAINT FK_DATASETFIELDTYPE_METADATABLOCK_ID FOREIGN KEY (METADATABLOCK_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileMetadatas_ID FOREIGN KEY (fileMetadatas_ID) REFERENCES FILEMETADATA (ID);
+ALTER TABLE FILEMETADATA_DATAFILECATEGORY ADD CONSTRAINT FK_FILEMETADATA_DATAFILECATEGORY_fileCategories_ID FOREIGN KEY (fileCategories_ID) REFERENCES DATAFILECATEGORY (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT FK_dataverse_citationDatasetFieldTypes_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataverse_citationDatasetFieldTypes ADD CONSTRAINT dataverse_citationDatasetFieldTypes_citationdatasetfieldtype_id FOREIGN KEY (citationdatasetfieldtype_id) REFERENCES DATASETFIELDTYPE (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_dataverse_id FOREIGN KEY (dataverse_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE dataversesubjects ADD CONSTRAINT FK_dataversesubjects_controlledvocabularyvalue_id FOREIGN KEY (controlledvocabularyvalue_id) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_Dataverse_ID FOREIGN KEY (Dataverse_ID) REFERENCES DVOBJECT (ID);
+ALTER TABLE DATAVERSE_METADATABLOCK ADD CONSTRAINT FK_DATAVERSE_METADATABLOCK_metadataBlocks_ID FOREIGN KEY (metadataBlocks_ID) REFERENCES METADATABLOCK (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT FK_DATASETFIELD_CONTROLLEDVOCABULARYVALUE_DatasetField_ID FOREIGN KEY (DatasetField_ID) REFERENCES DATASETFIELD (ID);
+ALTER TABLE DATASETFIELD_CONTROLLEDVOCABULARYVALUE ADD CONSTRAINT DTASETFIELDCONTROLLEDVOCABULARYVALUEcntrolledVocabularyValuesID FOREIGN KEY (controlledVocabularyValues_ID) REFERENCES CONTROLLEDVOCABULARYVALUE (ID);
+ALTER TABLE WorkflowStepData_STEPPARAMETERS ADD CONSTRAINT FK_WorkflowStepData_STEPPARAMETERS_WorkflowStepData_ID FOREIGN KEY (WorkflowStepData_ID) REFERENCES WORKFLOWSTEPDATA (ID);
+ALTER TABLE ExplicitGroup_CONTAINEDROLEASSIGNEES ADD CONSTRAINT FK_ExplicitGroup_CONTAINEDROLEASSIGNEES_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT FK_EXPLICITGROUP_AUTHENTICATEDUSER_ExplicitGroup_ID FOREIGN KEY (ExplicitGroup_ID) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE EXPLICITGROUP_AUTHENTICATEDUSER ADD CONSTRAINT EXPLICITGROUP_AUTHENTICATEDUSER_containedAuthenticatedUsers_ID FOREIGN KEY (containedAuthenticatedUsers_ID) REFERENCES AUTHENTICATEDUSER (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_explicitgroup_id FOREIGN KEY (explicitgroup_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE explicitgroup_explicitgroup ADD CONSTRAINT FK_explicitgroup_explicitgroup_containedexplicitgroups_id FOREIGN KEY (containedexplicitgroups_id) REFERENCES EXPLICITGROUP (ID);
+ALTER TABLE PendingWorkflowInvocation_LOCALDATA ADD CONSTRAINT PndngWrkflwInvocationLOCALDATAPndngWrkflwInvocationINVOCATIONID FOREIGN KEY (PendingWorkflowInvocation_INVOCATIONID) REFERENCES PENDINGWORKFLOWINVOCATION (INVOCATIONID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_datafile_id FOREIGN KEY (datafile_id) REFERENCES DVOBJECT (ID);
+ALTER TABLE fileaccessrequests ADD CONSTRAINT FK_fileaccessrequests_authenticated_user_id FOREIGN KEY (authenticated_user_id) REFERENCES AUTHENTICATEDUSER (ID);
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT DECIMAL(38), PRIMARY KEY (SEQ_NAME));
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0);
diff --git a/scripts/database/dbupgrade.sh b/scripts/database/dbupgrade.sh
new file mode 100755
index 00000000000..8c9f211dfea
--- /dev/null
+++ b/scripts/database/dbupgrade.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+if [[ $1"x" = "x" || $2"x" = "x" || $3"x" = "x" || $4"x" = "x" || $5"x" = "x" || $6"x" = "x" ]]
+then
+    echo >&2 "usage: ./upgrade.sh [VERSION_1] [VERSION_2] [PG_HOST] [PG_PORT] [PG_DB] [PG_USER]"
+    exit 1
+fi
+
+upgrade_from=$1
+upgrade_to=$2
+
+pg_host=$3
+pg_port=$4
+pg_database=$5
+pg_user=$6
+
+log_file=dbupgrade.$$.log
+
+echo "IMPORTANT!"
+echo "Make sure you BACK UP YOUR DATABASE before attempting this upgrade!"
+echo 
+echo "Hit RETURN to continue; or CTRL-C to exit"
+
+read line
+
+if [ ! -f releases.txt ]
+then
+    echo >&2 "Cannot locate the file \"releases.txt\" in the current directory!"
+    echo >&2 "Are you running the script in the correct directory?"
+    exit 1
+fi
+
+
+if ! grep -q '^'${upgrade_from}'$' releases.txt 
+then
+    echo >&2 "${upgrade_from} is not a valid Dataverse release"
+    exit 1
+fi
+
+if ! grep -q '^'${upgrade_to}'$' releases.txt 
+then
+    echo >&2 "${upgrade_to} is not a valid Dataverse release"
+    exit 1
+fi
+
+command -v psql >/dev/null 2>&1 || { 
+    echo >&2 'Cannot locate psql (PostgresQL command line utility)!';
+    echo >&2 'Make sure it is in your $PATH.';
+    echo >&2 'And if you have multiple versions of PostgresQL installed on your system,'; 
+    echo >&2 'make sure the psql in your $PATH is the same version your Dataverse is using.';
+    echo >&2 'Aborting...'; 
+    exit 1; 
+}
+
+echo "Enter the password for your PostgresQL database:"
+echo "(hit RETURN if you can access the database without a password)"
+read PGPASSWORD; export PGPASSWORD
+
+echo 
+echo "OK, let's verify that the PostgresQL credentials you provided are valid:"
+
+if dv_count=`psql -w -d ${pg_database} -U ${pg_user} -h ${pg_host} -p ${pg_port} -t -c "SELECT COUNT(*) FROM dataverse"`
+then
+    echo ok
+else 
+    echo >&2
+    echo >&2 "Failed to connect to the PostgresQL database!"
+    echo >&2 "Please verify your access credentials, and try again."
+    exit 1
+fi
+
+echo 
+echo "This script will attempt to upgrade the database ${pg_database},"
+echo "that currently has "`/bin/echo -n ${dv_count}`" dataverses, from version ${upgrade_from}"
+echo "to version ${upgrade_to}."
+echo "Hit RETURN to continue; or CTRL-C to exit"
+
+read line
+
+upgrade_flag="off"
+
+cat releases.txt | while read version
+do
+
+    if [ $upgrade_flag = "on" ]
+    then
+	# database create script: 
+	# (this will create the new tables, that were not present in the previous versions)
+
+	if [ ! -f create/create_${version}.sql ]
+	then
+	    echo >&2 "Cannot locate the create database script create/create_${version}.sql !"
+	    exit 1
+	fi
+
+	echo "Attempting to run the script create/create_${version}.sql..." | tee -a $log_file
+
+	if ! psql -w -d ${pg_database} -U ${pg_user} -h ${pg_host} -p ${pg_port} -f create/create_${version}.sql >>$log_file 2>&1
+	then
+	    echo >&2 "Failed to run the create database script for version ${version}"
+	    exit 1
+	fi
+
+	echo "ok"
+
+	# database ugprade script (if present): 
+	# (this will modify the tables that WERE present in the previous versions, 
+	# that were changed in this version (for example, if columns were added and/or 
+	# removed, if the data type of a certain column has changed, etc.)
+
+	if [ -f upgrades/upgrade_v*_to_${version}.sql ]
+	then
+	    echo "Attempting to execute the upgrade script:" upgrades/upgrade_v*_to_${version}.sql | tee -a $log_file
+
+	    if ! psql -w -d ${pg_database} -U ${pg_user} -h ${pg_host} -p ${pg_port} -f upgrades/upgrade_v*_to_${version}.sql >>$log_file 2>&1
+	    then
+		echo >&2 "Failed to run the upgrade database script for version ${version}"
+		exit 1
+	    fi
+
+	    echo "ok"
+	else
+	    echo "(there is no database upgrade script for version ${version}...)"
+	fi
+
+    fi
+
+    if [ $version = $upgrade_from ]
+    then
+	upgrade_flag="on"
+    fi
+
+    if [ $version = $upgrade_to ]
+    then
+	echo "OK, DONE."
+	echo "Your database has been upgraded to version ${version}"
+	exit 0
+    fi
+
+done
+
+
+
+
diff --git a/scripts/database/querycount/README.txt b/scripts/database/querycount/README.txt
new file mode 100644
index 00000000000..be67fd8d6b6
--- /dev/null
+++ b/scripts/database/querycount/README.txt
@@ -0,0 +1,56 @@
+This script counts queries *on the PostgresQL server side*. 
+
+To use it, enable verbose logging on the postgres server: 
+
+Edit your postgresql.conf (for example,
+/var/lib/pgsql/9.3/data/postgresql.conf) and set "log_statement" to
+"all", like this:
+
+log_statement = 'all'	       		# none, ddl, mod, all
+
+Then restart postgresql. 
+
+Now you should have a fast-growing log file in your pg_log directory.
+For example, /var/lib/pgsql/9.3/data/pg_log/postgresql-Tue.log. (The
+name of the log file may vary on your system!)
+
+Copy the 2 scripts, count.pl and parse.pl to the log directory. 
+
+For example: 
+
+cp scripts/database/querycount/*.pl  /var/lib/pgsql/9.3/data/pg_log/
+
+Then run the count script as follows: 
+
+cd /var/lib/pgsql/9.3/data/pg_log/
+./count.pl 
+
+you will see something like this:
+
+# ./count.pl postgresql-Mon.log 
+Current size: 3090929 bytes.
+Press any key when ready.
+
+Now go to your Dataverse and do whatever it is that you are
+testing. Then press any key to tell the script that it's done. It will
+then save the tail of the log file generated since you started the
+script, parse it, count the queries and output the total and the
+queries by type sorted by frequency:
+
+Parsed and counted the queries. Total number:
+22593
+
+Queries, counted and sorted: 
+
+   6248 SELECT ID, ASSIGNEEIDENTIFIER, PRIVATEURLTOKEN, DEFINITIONPOINT_ID, ROLE_ID FROM ROLEASSIGNMENT
+   6158 SELECT t1.ID, t1.DESCRIPTION, t1.DISPLAYNAME, t1.GROUPALIAS, t1.GROUPALIASINOWNER, t1.OWNER_ID FROM EXPLICITGROUP t0, explicitgroup_explicitgroup t2, EXPLICITGROUP t1
+   4934 SELECT t0.ID, t0.DESCRIPTION, t0.DISPLAYNAME, t0.GROUPALIAS, t0.GROUPALIASINOWNER, t0.OWNER_ID FROM EXPLICITGROUP t0, ExplicitGroup_CONTAINEDROLEASSIGNEES t1
+   2462 SELECT t1.ID, t1.DESCRIPTION, t1.DISPLAYNAME, t1.GROUPALIAS, t1.GROUPALIASINOWNER, t1.OWNER_ID FROM AUTHENTICATEDUSER t0, EXPLICITGROUP_AUTHENTICATEDUSER t2, EXPLICITGROUP t1
+    647 SELECT ID, BACKGROUNDCOLOR, LINKCOLOR, LINKURL, LOGO, LOGOALIGNMENT, LOGOBACKGROUNDCOLOR, LOGOFORMAT, TAGLINE, TEXTCOLOR, dataverse_id FROM DATAVERSETHEME
+
+   ... etc. 
+
+(the output is also saved in the file "tail.counted" in the pg_log directory)
+
+
+ 
diff --git a/scripts/database/querycount/count.pl b/scripts/database/querycount/count.pl
new file mode 100755
index 00000000000..6ca178bd8e5
--- /dev/null
+++ b/scripts/database/querycount/count.pl
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+
+my $pglogfile = shift @ARGV;
+
+unless ( -f $pglogfile )
+{
+    die "usage: ./count.pl \n";
+}
+
+my $pglogfilesize = (stat($pglogfile))[7];
+print "Current size: ".$pglogfilesize." bytes.\n";
+print "Press any key when ready.\n";
+
+system "stty cbreak /dev/tty 2>&1";
+my $key = getc(STDIN);
+system "stty -cbreak /dev/tty 2>&1";
+print "\n";
+
+my $newsize = (stat($pglogfile))[7];
+my $diff = $newsize - $pglogfilesize;
+
+system "tail -c ".$diff." < ".$pglogfile." > tail";
+
+print "Increment: ".$diff." bytes.\n";
+
+system "./parse.pl < tail > tail.parsed";
+
+system "cat tail.parsed | sed 's/ where.*//' | sed 's/ WHERE.*//' | sort | uniq -c | sort -nr -k 1,2 > tail.counted";
+
+
+print "Parsed and counted the queries. Total number:\n";
+
+system "awk '{a+=\$1}END{print a}' < tail.counted";
+
+print "\nQueries, counted and sorted: \n\n";
+
+system "cat tail.counted";
diff --git a/scripts/database/querycount/parse.pl b/scripts/database/querycount/parse.pl
new file mode 100755
index 00000000000..b0fb9ed303a
--- /dev/null
+++ b/scripts/database/querycount/parse.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/perl 
+
+while (<>) 
+{
+    chop; 
+    if ( /execute : (select .*)$/i || /execute : (insert .*)$/i || /execute : (update .*)$/i)
+    {
+	$select_q = $1; 
+
+	if ($select_q =~/\$1/)
+	{
+	    # saving the query, will substitute parameters
+	    #print STDERR "saving query: " . $select_q . "\n";
+
+	}
+	else 
+	{
+	    print $select_q . "\n";
+	    $select_q = "";
+	}
+    }
+    elsif (/^.*[A-Z][A-Z][A-Z] >DETAIL:  parameters: (.*)$/i)
+    {
+#	print STDERR "EDT detail line encountered.\n";
+	unless ($select_q)
+	{
+	    die "EDT DETAIL encountered (" . $_ . ", no select_q\n";
+	}
+
+	$params = $1; 
+
+	@params_ = split (",", $params); 
+
+	for $p (@params_)
+	{
+	    $p =~s/^ *//; 
+	    $p =~s/ *$//; 
+	    $p =~s/ *=/=/g;
+	    $p =~s/= */=/g; 
+
+#	    print STDERR $p . "\n";
+
+	    ($name,$value) = split ("=", $p); 
+
+	    $name =~s/^\$//g; 
+
+#	    print STDERR "name: $name, value: $value\n";
+
+
+	    $select_q =~s/\$$name/$value/ge;
+	}
+
+	print $select_q . "\n"; 
+	$select_q = "";
+    }
+}
diff --git a/scripts/database/releases.txt b/scripts/database/releases.txt
new file mode 100644
index 00000000000..60eb70f6ff7
--- /dev/null
+++ b/scripts/database/releases.txt
@@ -0,0 +1,31 @@
+v4.0
+v4.0.1
+v4.1
+v4.2
+v4.2.1
+v4.2.2
+v4.2.3
+v4.2.4
+v4.3
+v4.3.1
+v4.4
+v4.5
+v4.5.1
+v4.6
+v4.6.1
+v4.6.2
+v4.7
+v4.7.1
+v4.8
+v4.8.1
+v4.8.2
+v4.8.3
+v4.8.4
+v4.8.5
+v4.8.6
+v4.9
+v4.9.1
+v4.9.2
+v4.9.3
+v4.9.4
+v4.10
diff --git a/scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql b/scripts/database/upgrades/upgrade_v4.2.4_to_v4.3.sql
similarity index 100%
rename from scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql
rename to scripts/database/upgrades/upgrade_v4.2.4_to_v4.3.sql
diff --git a/scripts/database/upgrades/upgrade_v4.7.1_to_v4.8.sql b/scripts/database/upgrades/upgrade_v4.7.1_to_v4.8.sql
index 2ec31218bc7..134143d27a0 100644
--- a/scripts/database/upgrades/upgrade_v4.7.1_to_v4.8.sql
+++ b/scripts/database/upgrades/upgrade_v4.7.1_to_v4.8.sql
@@ -13,3 +13,18 @@ WHERE dvobject.id=ds.id)
 WHERE storageidentifier IS NULL;
 
 ALTER TABLE datafile DROP COLUMN filesystemname;
+
+ALTER TABLE DATASETLOCK ADD COLUMN REASON VARCHAR(255);
+
+-- All existing dataset locks are due to ingest.
+UPDATE DATASETLOCK set REASON='Ingest';
+
+-- /!\ Important!
+-- you may need to change "1" to the id of the admin user you prefer to use - if you are using a different admin user, from the one that's created by the setup-all script.
+--
+INSERT INTO datasetlock (info, starttime, dataset_id, user_id, reason)
+SELECT '', localtimestamp, dataset_id, 1, 'InReview'
+FROM datasetversion
+WHERE inreview=true;
+
+ALTER TABLE DATASETVERSION DROP COLUMN inreview;
diff --git a/scripts/database/upgrades/upgrade_v4.8.6_to_v4.9.0.sql b/scripts/database/upgrades/upgrade_v4.8.6_to_v4.9.sql
similarity index 100%
rename from scripts/database/upgrades/upgrade_v4.8.6_to_v4.9.0.sql
rename to scripts/database/upgrades/upgrade_v4.8.6_to_v4.9.sql
diff --git a/scripts/database/upgrades/upgrade_v4.9.1_to_v4.9.2.sql b/scripts/database/upgrades/upgrade_v4.9.1_to_v4.9.2.sql
index 7230c16e90f..0108298df68 100644
--- a/scripts/database/upgrades/upgrade_v4.9.1_to_v4.9.2.sql
+++ b/scripts/database/upgrades/upgrade_v4.9.1_to_v4.9.2.sql
@@ -1,2 +1,3 @@
+INSERT INTO setting(name, content) VALUES (':UploadMethods', 'native/http');
 ALTER TABLE datavariable ADD COLUMN factor BOOLEAN;
 ALTER TABLE ingestrequest ADD COLUMN forceTypeCheck BOOLEAN;
diff --git a/scripts/database/upgrades/upgrade_v4.9.4_to_v4.10.sql b/scripts/database/upgrades/upgrade_v4.9.4_to_v4.10.sql
new file mode 100644
index 00000000000..c691a9d2e66
--- /dev/null
+++ b/scripts/database/upgrades/upgrade_v4.9.4_to_v4.10.sql
@@ -0,0 +1,16 @@
+ALTER TABLE usernotification
+ADD requestor_id BIGINT;
+ALTER TABLE datasetfieldtype ADD COLUMN uri text;
+ALTER TABLE metadatablock ADD COLUMN namespaceuri text;
+ALTER TABLE pendingworkflowinvocation ADD COLUMN datasetexternallyreleased BOOLEAN;
+
+INSERT INTO setting(
+           name, content)
+   VALUES (':UploadMethods', 'native/http');
+
+ALTER TABLE actionlogrecord ALTER COLUMN info TYPE text;
+
+
+ALTER TABLE dataverse ALTER COLUMN defaultcontributorrole_id DROP NOT NULL;
+
+ALTER TABLE datatable ADD COLUMN originalfilesize BIGINT; 
\ No newline at end of file
diff --git a/scripts/deploy/phoenix.dataverse.org/post b/scripts/deploy/phoenix.dataverse.org/post
index 19a8f9a100d..6348e83f24d 100755
--- a/scripts/deploy/phoenix.dataverse.org/post
+++ b/scripts/deploy/phoenix.dataverse.org/post
@@ -1,11 +1,11 @@
 #/bin/sh
 cd scripts/api
-./setup-all.sh --insecure | tee /tmp/setup-all.sh.out
+./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
 cd ../..
 psql -U dvnapp dvndb -f scripts/database/reference_data.sql
 psql -U dvnapp dvndb -f doc/sphinx-guides/source/_static/util/pg8-createsequence-prep.sql
 psql -U dvnapp dvndb -f doc/sphinx-guides/source/_static/util/createsequence.sql
-curl http://localhost:8080/api/admin/settings/:DoiProvider -X PUT -d DataCite
+curl http://localhost:8080/api/admin/settings/:DoiProvider -X PUT -d FAKE
 scripts/search/tests/publish-dataverse-root
 git checkout scripts/api/data/dv-root.json
 scripts/search/tests/grant-authusers-add-on-root
diff --git a/scripts/globalid/doi/migration_ezid2datacite/README.txt b/scripts/globalid/doi/migration_ezid2datacite/README.txt
new file mode 100644
index 00000000000..020379e82eb
--- /dev/null
+++ b/scripts/globalid/doi/migration_ezid2datacite/README.txt
@@ -0,0 +1,163 @@
+This is	the migration instruction for moving a Dataverse installation using EZID to DataCite. 
+
+The corresponding GitHub issue is https://github.com/IQSS/dataverse/issues/5024
+
+The migration is necessary since non-University of
+California Dataverse installations will no longer be able to use EZID
+to mint DOIs
+(https://www.cdlib.org/cdlinfo/2017/08/04/ezid-doi-service-is-evolving/).
+
+EZID has provided a document outlining the conversion process: https://docs.google.com/document/d/1rsjFl6CvyiGaCE1SMpougZaFc135oBV_CkypoQx9x8g/edit
+
+Key issues and steps: 
+
+1. [This issue was most likely unique to the Harvard Dataverse only]
+When the concept of the global id for a DataFile was added, Harvard
+Dataverse registered DOIs for all the published files (but only for
+such files that belonged to the datasets with DOIs for the global ids
+of their own; files in the datasets with handles are a pending
+issue). Because of a problem with the original version of the
+registration API, all these DOIs were registered as "reserved",
+instead of public. Reserved EZID DOIs (as explained in the document
+above) CANNOT BE MIGRATED, they are only known to the EZID. So all
+these file DOIs had to be changed to "public". We used a script found
+in scripts/globalid/doi/ezid in this source tree.
+
+2. You need to register with DataCite and obtain an account. The login
+name and password for the account will replace the current EZID
+credentials specified in the JVM options doi.username and doi.password
+respectively.
+
+Once you obtain this account, you will be able to register DOIs in the
+TEST NAME SPACE ONLY (10.5072), and NOT in your currently configured
+DOI space. (but read on, on how to move your current name space and
+existing DOIs to the DataCite account)
+
+3. In addition to the login name and password above, the following
+configuration settings will need to be changed:
+
+- the jvm option doi.baseurlstring needs to be changed to https://mds.datacite.org
+- the database setting DoiProvider needs to be changed to DataCite
+
+4. Presumably you will want to continue using your current registration name space and shoulder; 
+(these are specified as database settings). 
+
+The name space, and all your existing DOIs in it, MUST BE EXPLICITLY
+CONVERTED, in order to move them under the "jurisdiction" of your new
+DataCite account.
+
+Note that the migration document, above, does not really specify how
+to do it - it only says that they have "a process" for that. The
+process is quite simple though. You contact the DataCite support (not
+the EZID), give them your name space, your old EZID account name and
+the new DataCite account name - and they do the rest.
+
+Few important things:
+
+- They will want a few days of advance notice;
+
+- The transfer is NOT instant; it requires changing the records for
+  individual DOIs, and reindexing them. For Harvard Dataverse, with
+  roughly 200,000 published DOIs the time estimate was "about 6
+  hours";
+
+- Most of the DataCite staff is in Europe, so assume that this will
+  happen during European business hours;
+
+- They ask that NO NEW DOIs ARE REGISTERED during the migration
+  window!  Here at Harvard we decided that bringing the entire system
+  down for the duration of the transfer was an overkill. So we are
+  planning to put up a site notice warning the users that they will
+  not be able to publish their datasets for a few hours. And then
+  blank the JVM options with the registration credentials as the
+  migration is initiated. (So if any user misses the warning and still
+  tries to publish, it will fail with an error message). We assume
+  that everything else should still function during that window.
+
+
+5. It was pointed out that the new DataCite API now supports the
+notion of a "draft" DOI. Which is somewhat similar to a "reserved"
+EZID DOI. We are planning to *eventually* add this to our DataCite
+implementation; and create these "draft" DOIs for new, unpublished
+draft datasets (similarly to how the EZID implementation creates
+reserved DOIs now). For now however, we are simply letting the
+reserved EZID DOIs of draft datasets go. They will still be reserved
+in the Dataverse database of course; and eventually registered, when
+the users publish the datasets. It would be possible to extract these
+DOIs of unpublished datasets from the database, and put together a
+script that would register them as draft DOIs with DataCite, using
+their new API... But we are not doing this for our DOIs here.
+
+
+6. The Harvard Dataverse has carried out the migration on Oct. 17.
+The process was started at 9AM European time, 3AM local.  As specified
+above, DataCite people requested that we don't try to mind any
+DOIs during the transfer window. So on the day before the migration we put 
+the following announcements on our pages: 
+
+curl -X PUT -d "Warning: Users may not be able to PUBLISH their 
+datasets, between 3AM-9AM Wed. Oct. 17" \
+http://localhost:8080/api/admin/settings/:StatusMessageHeader
+
+curl -X PUT -d "Harvard Dataverse is in the process of switching from
+EZID to DataCite, as the provider for registering the persistent
+identifiers for Datasets and Datafiles. The migration transfer of the
+authority and the existing identifiers will happen between 3AM and
+approx. 9AM on Wed. Oct 17 (i.e. late tonight). During the migration
+window updating DOI registration may not work properly. 
+So we recommend not to attempt to publish your Datasets
+during the hours between 3AM and until this message disappears from
+the main page." \
+http://localhost:8080/api/admin/settings/:StatusMessageText
+
+
+Right before the start of the migration process we changed the old
+(EZID) configuration to the new (DataCite).
+
+The Database "provider" setting: 
+
+curl -X PUT -d "DataCite" http://localhost:8080/api/admin/settings/:DoiProvider
+
+The JVM options: 
+
+removed the old ones: 
+
+asadmin delete-jvm-options "\-Ddoi.baseurlstring=https\://ezid.cdlib.org"
+asadmin delete-jvm-options "\-Ddoi.username=[OUR EZID ACCOUNT USERNAME]"
+asadmin delete-jvm-options "\-Ddoi.password=[OUR EZID ACCOUNT PASSWORD]"
+
+and added the new ones: 
+
+asadmin create-jvm-options "\-Ddoi.baseurlstring=https\://mds.datacite.org"
+asadmin create-jvm-options "\-Ddoi.username=[OUR DATACITE ACCOUNT USERNAME]"
+asadmin delete-jvm-options "\-Ddoi.password=PLACEHOLDER'
+
+- NOTE THE FAKE PLACEHOLDER password - that was to keep the new
+configuration disabled during the migration.
+
+Once the prefix was transferred to DataCite and they told us that it
+was safe to mint DOIs again, we re-enabled the configuration by adding
+the real password to the configuration:
+
+asadmin delete-jvm-options "\-Ddoi.password="'PLACEHOLDER'
+asadmin create-jvm-options "\-Ddoi.password=[OUR DATACITE ACCOUNT PASSWORD]'
+
+And then removed the warning messages from the page: 
+
+curl -X DELETE http://localhost:8080/api/admin/settings/:StatusMessageText
+curl -X DELETE http://localhost:8080/api/admin/settings/:StatusMessageHeader
+
+
+We have a large number of public DOIs (240K as of the day of the
+migration). It took about 12 hours (not 6, as originally anticipated)
+to reindex them all in the DataCite database. So crude math suggests
+it's about 20K DOIs/hour.
+
+We chose to re-enable the registration setup as soon as we had heard
+from DataCite that it was safe to mint new DOIs again. Even though
+some of the existing DOIs were still being reindexed. That meant that,
+for a few more hours, it was still possible for some user to try and
+re-publish a previously published dataset and get an error; because it
+would still be under the EZID authority. It didn't actually shappen,
+to the best of our knowledge. And if it had, we would have simply
+advised them to wait a couple of hours and try again.
diff --git a/scripts/installer/ec2-create-instance.sh b/scripts/installer/ec2-create-instance.sh
old mode 100755
new mode 100644
index fe84c115f84..c494ce2be8e
--- a/scripts/installer/ec2-create-instance.sh
+++ b/scripts/installer/ec2-create-instance.sh
@@ -1,24 +1,29 @@
-#!/bin/bash
+#!/bin/bash -e
 
 # For docs, see the "Deployment" page in the Dev Guide.
 
-SUGGESTED_REPO_URL='https://github.com/IQSS/dataverse.git'
-SUGGESTED_BRANCH='develop'
+# repo and branch defaults
+REPO_URL='https://github.com/IQSS/dataverse.git'
+BRANCH='develop'
 
 usage() {
-  echo "Usage: $0 -r $REPO_URL -b $SUGGESTED_BRANCH" 1>&2
+  echo "Usage: $0 -b  -r  -e " 1>&2
+  echo "default branch is develop"
+  echo "default repo is https://github.com/IQSS/dataverse"
+  echo "default conf file is ~/.dataverse/ec2.env"
   exit 1
 }
 
-REPO_URL=$SUGGESTED_REPO_URL
-
-while getopts ":r:b:" o; do
+while getopts ":r:b:e:" o; do
   case "${o}" in
   r)
     REPO_URL=${OPTARG}
     ;;
   b)
-    BRANCH_NAME=${OPTARG}
+    BRANCH=${OPTARG}
+    ;;
+  e)
+    EC2ENV=${OPTARG}
     ;;
   *)
     usage
@@ -26,20 +31,45 @@ while getopts ":r:b:" o; do
   esac
 done
 
+# test for user-supplied conf files
+if [ ! -z "$EC2ENV" ]; then
+   CONF=$EC2ENV
+elif [ -f ~/.dataverse/ec2.env ]; then
+   echo "using environment variables specified in ~/.dataverse/ec2.env."
+   echo "override with -e "
+   CONF="$HOME/.dataverse/ec2.env"
+else
+   echo "no conf file supplied (-e ) or found at ~/.dataverse/ec2.env."
+   echo "running script with defaults. this may or may not be what you want."
+fi
+   
+# read environment variables from conf file
+if [ ! -z "$CONF" ];then
+   set -a
+   echo "reading $CONF"
+   source $CONF
+   set +a
+fi
+
+# now build extra-vars string from doi_* env variables
+NL=$'\n'
+extra_vars="dataverse_branch=$BRANCH dataverse_repo=$REPO_URL"
+while IFS='=' read -r name value; do
+  if [[ $name == *'doi_'* ]]; then
+    extra_var="$name"=${!name}
+    extra_var=${extra_var%$NL}
+    extra_vars="$extra_vars $extra_var"
+  fi
+done < <(env)
+
 AWS_CLI_VERSION=$(aws --version)
 if [[ "$?" -ne 0 ]]; then
   echo 'The "aws" program could not be executed. Is it in your $PATH?'
   exit 1
 fi
 
-if [ "$BRANCH_NAME" = "" ]; then
-  echo "No branch name provided. You could try adding \"-b $SUGGESTED_BRANCH\" or other branches listed at $SUGGESTED_REPO_URL"
-  usage
-  exit 1
-fi
-
-if [[ $(git ls-remote --heads $REPO_URL $BRANCH_NAME | wc -l) -eq 0 ]]; then
-  echo "Branch \"$BRANCH_NAME\" does not exist at $REPO_URL"
+if [[ $(git ls-remote --heads $REPO_URL $BRANCH | wc -l) -eq 0 ]]; then
+  echo "Branch \"$BRANCH\" does not exist at $REPO_URL"
   usage
   exit 1
 fi
@@ -83,6 +113,8 @@ echo "Creating EC2 instance"
 # TODO: Add some error checking for "ec2 run-instances".
 INSTANCE_ID=$(aws ec2 run-instances --image-id $AMI_ID --security-groups $SECURITY_GROUP --count 1 --instance-type $SIZE --key-name $KEY_NAME --query 'Instances[0].InstanceId' --block-device-mappings '[ { "DeviceName": "/dev/sda1", "Ebs": { "DeleteOnTermination": true } } ]' | tr -d \")
 echo "Instance ID: "$INSTANCE_ID
+echo "giving instance 15 seconds to wake up..."
+sleep 15
 echo "End creating EC2 instance"
 
 PUBLIC_DNS=$(aws ec2 describe-instances --instance-ids $INSTANCE_ID --query "Reservations[*].Instances[*].[PublicDnsName]" --output text)
@@ -92,7 +124,7 @@ USER_AT_HOST="centos@${PUBLIC_DNS}"
 echo "New instance created with ID \"$INSTANCE_ID\". To ssh into it:"
 echo "ssh -i $PEM_FILE $USER_AT_HOST"
 
-echo "Please wait at least 15 minutes while the branch \"$BRANCH_NAME\" from $REPO_URL is being deployed."
+echo "Please wait at least 15 minutes while the branch \"$BRANCH\" from $REPO_URL is being deployed."
 
 # epel-release is installed first to ensure the latest ansible is installed after
 # TODO: Add some error checking for this ssh command.
@@ -101,7 +133,8 @@ sudo yum -y install epel-release
 sudo yum -y install git nano ansible
 git clone https://github.com/IQSS/dataverse-ansible.git dataverse
 export ANSIBLE_ROLES_PATH=.
-ansible-playbook -i dataverse/inventory dataverse/dataverse.pb --connection=local --extra-vars "dataverse_branch=$BRANCH_NAME dataverse_repo=$REPO_URL"
+echo $extra_vars
+ansible-playbook -v -i dataverse/inventory dataverse/dataverse.pb --connection=local --extra-vars "$extra_vars"
 EOF
 
 # Port 8080 has been added because Ansible puts a redirect in place
@@ -110,6 +143,6 @@ EOF
 CLICKABLE_LINK="http://${PUBLIC_DNS}:8080"
 echo "To ssh into the new instance:"
 echo "ssh -i $PEM_FILE $USER_AT_HOST"
-echo "Branch \"$BRANCH_NAME\" from $REPO_URL has been deployed to $CLICKABLE_LINK"
+echo "Branch \"$BRANCH\" from $REPO_URL has been deployed to $CLICKABLE_LINK"
 echo "When you are done, please terminate your instance with:"
 echo "aws ec2 terminate-instances --instance-ids $INSTANCE_ID"
diff --git a/scripts/installer/ec2.env b/scripts/installer/ec2.env
new file mode 100644
index 00000000000..0c003f2e1c1
--- /dev/null
+++ b/scripts/installer/ec2.env
@@ -0,0 +1,5 @@
+doi_baseurl="https://mds.test.datacite.org/"
+doi_username="test.account"
+doi_password="not.my.password"
+doi_authority="10.5072"
+doi_shoulder="FK2/"
diff --git a/scripts/installer/glassfish-setup.sh b/scripts/installer/glassfish-setup.sh
index ada50fc6e66..2f7ae279923 100755
--- a/scripts/installer/glassfish-setup.sh
+++ b/scripts/installer/glassfish-setup.sh
@@ -24,6 +24,11 @@
 # RSERVE_USER
 # RSERVE_PASS
 #
+# DOI configuration:
+# DOI_USERNAME
+# DOI_PASSWORD
+# DOI_BASEURL
+#
 # other local configuration:
 # HOST_ADDRESS
 # SMTP_SERVER
@@ -68,9 +73,11 @@ function preliminary_setup()
 
   # DataCite DOI Settings
   # (we can no longer offer EZID with their shared test account)
-  #./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.password=apitest"
-  #./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.username=apitest"
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.baseurlstring=https\://mds.test.datacite.org"
+  # jvm-options use colons as separators, escape as literal
+  DOI_BASEURL_ESC=`echo $DOI_BASEURL | sed -e 's/:/\\\:/'`
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.username=${DOI_USERNAME}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.password=${DOI_PASSWORD}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.baseurlstring=$DOI_BASEURL_ESC"
 
   ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
   # enable comet support
@@ -294,7 +301,9 @@ fi
 ###
 # Restart
 echo Updates done. Restarting...
-./asadmin $ASADMIN_OPTS restart-domain $GLASSFISH_DOMAIN
+# encountered cases where `restart-domain` timed out, but `stop` -> `start` didn't.
+./asadmin $ASADMIN_OPTS stop-domain $GLASSFISH_DOMAIN
+./asadmin $ASADMIN_OPTS start-domain $GLASSFISH_DOMAIN
 
 ###
 # Clean up
diff --git a/scripts/installer/install b/scripts/installer/install
index aaeec37a87f..ef535f9c292 100755
--- a/scripts/installer/install
+++ b/scripts/installer/install
@@ -80,7 +80,11 @@ else
 	'RSERVE_HOST',
 	'RSERVE_PORT',
 	'RSERVE_USER',
-	'RSERVE_PASSWORD'
+	'RSERVE_PASSWORD',
+
+	'DOI_USERNAME',
+	'DOI_PASSWORD',
+	'DOI_BASEURL'
 
 	);
 }
@@ -105,7 +109,11 @@ my %CONFIG_DEFAULTS = (
     'RSERVE_HOST',     'localhost',
     'RSERVE_PORT',     6311,
     'RSERVE_USER',     'rserve',
-    'RSERVE_PASSWORD', 'rserve'
+    'RSERVE_PASSWORD', 'rserve',
+
+    'DOI_USERNAME',    'dataciteuser',
+    'DOI_PASSWORD',    'datacitepassword',
+    'DOI_BASEURL',     'https://mds.test.datacite.org',
 
 );
 
@@ -128,7 +136,11 @@ my %CONFIG_PROMPTS = (
     'RSERVE_HOST',     'Rserve Server',
     'RSERVE_PORT',     'Rserve Server Port',
     'RSERVE_USER',     'Rserve User Name',
-    'RSERVE_PASSWORD', 'Rserve User Password'
+    'RSERVE_PASSWORD', 'Rserve User Password',
+
+    'DOI_USERNAME',    'Datacite username',
+    'DOI_PASSWORD',    'Datacite password',
+    'DOI_BASEURL',    'Datacite URL'
 
 );
 
@@ -152,7 +164,11 @@ my %CONFIG_COMMENTS = (
     'RSERVE_HOST',     '',
     'RSERVE_PORT',     '',
     'RSERVE_USER',     '',
-    'RSERVE_PASSWORD', ''
+    'RSERVE_PASSWORD', '',
+
+    'DOI_USERNAME',    'DataCite or EZID username. Only necessary for publishing / minting DOIs.',
+    'DOI_PASSWORD',    'DataCite or EZID account password.',
+    'DOI_BASEURL',    'DataCite or EZID URL. Probably https://mds.datacite.org'
 
 );
 
@@ -945,8 +961,13 @@ sub setup_glassfish {
     print STDERR $DOMAIN_DOWN . "\n";
     if ($DOMAIN_DOWN) {
 	print "Trying to start domain up...\n";
-	system( "sudo -u $CONFIG_DEFAULTS{'GLASSFISH_USER'} " . $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
-	
+	if ( $current_user eq $CONFIG_DEFAULTS{'GLASSFISH_USER'} ){
+		system( $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
+	}
+	else
+	{
+		system( "sudo -u $CONFIG_DEFAULTS{'GLASSFISH_USER'} " . $CONFIG_DEFAULTS{'GLASSFISH_DIRECTORY'} . "/bin/asadmin start-domain domain1" );
+	}
 	# TODO: (?) - retest that the domain is running now? 
     }
     else
diff --git a/src/main/java/BuiltInRoles.properties b/src/main/java/BuiltInRoles.properties
new file mode 100644
index 00000000000..3c4b8020002
--- /dev/null
+++ b/src/main/java/BuiltInRoles.properties
@@ -0,0 +1,16 @@
+role.admin.name=Admin
+role.admin.description=A person who has all permissions for dataverses, datasets, and files.
+role.editor.name=Contributor
+role.editor.description=For datasets, a person who can edit License + Terms, and then submit them for review.
+role.curator.name=Curator
+role.curator.description=For datasets, a person who can edit License + Terms, edit Permissions, and publish datasets.
+role.dscontributor.name=Dataset Creator
+role.dscontributor.description=A person who can add datasets within a dataverse.
+role.fullcontributor.name=Dataverse + Dataset Creator
+role.fullcontributor.description=A person who can add subdataverses and datasets within a dataverse.
+role.dvcontributor.name=Dataverse Creator
+role.dvcontributor.description=A person who can add subdataverses within a dataverse.
+role.filedownloader.name=File Downloader
+role.filedownloader.description=A person who can download a published file.
+role.member.name=Member
+role.member.description=A person who can view both unpublished dataverses and datasets.
\ No newline at end of file
diff --git a/src/main/java/BuiltInRoles_fr.properties b/src/main/java/BuiltInRoles_fr.properties
new file mode 100644
index 00000000000..296b197d8e5
--- /dev/null
+++ b/src/main/java/BuiltInRoles_fr.properties
@@ -0,0 +1,16 @@
+role.admin.name=Administrateur
+role.admin.description=Une personne disposant de toutes les autorisations sur les dataverses, les ensembles de donnes et les fichiers.
+role.editor.name=Collaborateur
+role.editor.description=Pour les ensembles de donnes, une personne pouvant modifier la licence et les conditions, puis les soumettre pour rvision.
+role.curator.name=Curateur
+role.curator.description=Pour les ensembles de donnes, une personne pouvant modifier la licence et les conditions, diter les autorisations, et publier des ensembles de donnes.
+role.dscontributor.name=Crateur d'ensembles de donnes
+role.dscontributor.description=Une personne qui peut ajouter des ensembles de donnes dans un dataverse.
+role.fullcontributor.name=Crateur de dataverses et d'ensembles de donnes
+role.fullcontributor.description=Une personne qui peut ajouter des sous-dataverses et des ensembles de donnes dans un dataverse.
+role.dvcontributor.name=Crateur de dataverses
+role.dvcontributor.description=Une personne qui peut ajouter des sous-dataverses dans un dataverse.
+role.filedownloader.name=Tlchargeur de fichiers
+role.filedownloader.description=Une personne qui peut tlcharger un fichier publi.
+role.member.name=Membre
+role.member.description=Une personne qui peut consulter les dataverses et les ensembles de donnes non publis.
\ No newline at end of file
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index 708593c392c..d857d6d8026 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -149,6 +149,7 @@ contact.context.support.intro={0},\n\nThe following message was sent from {1}.\n
 contact.context.support.ending=\n\n---\n\nMessage sent from Support contact form.
 
 # dataverseuser.xhtml
+institution.name=A Dataverse Instance
 account.info=Account Information
 account.edit=Edit Account
 account.apiToken=API Token
@@ -170,14 +171,14 @@ worldMap.added=dataset had a WorldMap layer data added to it.
 # Bundle file editors, please note that "notification.welcome" is used in a unit test.
 notification.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}. Also, check for your welcome email to verify your address.
 notification.demoSite=Demo Site
-notification.requestFileAccess=File access requested for dataset: {0}.
+notification.requestFileAccess=File access requested for dataset: {0} was made by {1} ({2}).
 notification.grantFileAccess=Access granted for files in dataset: {0}.
 notification.rejectFileAccess=Access rejected for requested files in dataset: {0}.
 notification.createDataverse={0} was created in {1} . To learn more about what you can do with your dataverse, check out the {2}. 
 notification.dataverse.management.title=Dataverse Management - Dataverse User Guide
 notification.createDataset={0} was created in {1}. To learn more about what you can do with a dataset, check out the {2}.
 notification.dataset.management.title=Dataset Management - Dataset User Guide
-notification.wasSubmittedForReview={0} was submitted for review to be published in {1}. Don''t forget to publish it or send it back to the contributor\!
+notification.wasSubmittedForReview={0} was submitted for review to be published in {1}. Don''t forget to publish it or send it back to the contributor, {2} ({3})\!
 notification.wasReturnedByReviewer={0} was returned by the curator of {1}.
 notification.wasPublished={0} was published in {1}.
 notification.worldMap.added={0}, dataset had WorldMap layer data added to it.
@@ -246,6 +247,7 @@ passwdVal.goodStrengthRule.errorMsg =Note: passwords are always valid with a %1$
 passwdVal.goodStrengthRule.errorCode =NO_GOODSTRENGTH
 passwdVal.passwdReset.resetLinkTitle =Password Reset Link
 passwdVal.passwdReset.resetLinkDesc =Your password reset link is not valid
+passwdVal.passwdReset.resetInitiated=Password Reset Initiated
 passwdVal.passwdReset.valBlankLog =new password is blank
 passwdVal.passwdReset.valFacesError =Password Error
 passwdVal.passwdReset.valFacesErrorDesc =Please enter a new password for your account.
@@ -264,6 +266,9 @@ login.institution.support.afterLink=for assistance.
 login.builtin.credential.usernameOrEmail=Username/Email
 login.builtin.credential.password=Password
 login.builtin.invalidUsernameEmailOrPassword=The username, email address, or password you entered is invalid. Need assistance accessing your account?
+login.echo.credential.name=Name
+login.echo.credential.email=Email
+login.echo.credential.affiliation=Affiliation
 # how do we exercise login.error? Via a password upgrade failure? See https://github.com/IQSS/dataverse/pull/2922
 login.error=Error validating the username, email address, or password. Please try again. If the problem persists, contact an administrator.
 user.error.cannotChangePassword=Sorry, your password cannot be changed. Please contact your system administrator.
@@ -586,14 +591,14 @@ notification.email.greeting=Hello, \n
 # Bundle file editors, please note that "notification.email.welcome" is used in a unit test
 notification.email.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the User Guide at {1}/{2}/user or contact {3} at {4} for assistance.
 notification.email.welcomeConfirmEmailAddOn=\n\nPlease verify your email address at {0} . Note, the verify link will expire after {1}. Send another verification email by visiting your account page.
-notification.email.requestFileAccess=File access requested for dataset: {0}. Manage permissions at {1}.
+notification.email.requestFileAccess=File access requested for dataset: {0} by {1} ({2}). Manage permissions at {3}.
 notification.email.grantFileAccess=Access granted for files in dataset: {0} (view at {1}).
 notification.email.rejectFileAccess=Your request for access was rejected for the requested files in the dataset: {0} (view at {1}). If you have any questions about why your request was rejected, you may reach the dataset owner using the "Contact" link on the upper right corner of the dataset page.
 # Bundle file editors, please note that "notification.email.createDataverse" is used in a unit test
 notification.email.createDataverse=Your new dataverse named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with your dataverse, check out the Dataverse Management - User Guide at {4}/{5}/user/dataverse-management.html .
 # Bundle file editors, please note that "notification.email.createDataset" is used in a unit test
 notification.email.createDataset=Your new dataset named {0} (view at {1} ) was created in {2} (view at {3} ). To learn more about what you can do with a dataset, check out the Dataset Management - User Guide at {4}/{5}/user/dataset-management.html .
-notification.email.wasSubmittedForReview={0} (view at {1}) was submitted for review to be published in {2} (view at {3}). Don''t forget to publish it or send it back to the contributor\!
+notification.email.wasSubmittedForReview={0} (view at {1}) was submitted for review to be published in {2} (view at {3}). Don''t forget to publish it or send it back to the contributor, {4} ({5})\!
 notification.email.wasReturnedByReviewer={0} (view at {1}) was returned by the curator of {2} (view at {3}).
 notification.email.wasPublished={0} (view at {1}) was published in {2} (view at {3}).
 notification.email.worldMap.added={0} (view at {1}) had WorldMap layer data added to it.
@@ -601,6 +606,8 @@ notification.email.closing=\n\nYou may contact us for support at {0}.\n\nThank y
 notification.email.assignRole=You are now {0} for the {1} "{2}" (view at {3}).
 notification.email.revokeRole=One of your roles for the {0} "{1}" has been revoked (view at {2}).
 notification.email.changeEmail=Hello, {0}.{1}\n\nPlease contact us if you did not intend this change or if you need assistance.
+notification.email.passwordReset=Hi {0},\n\nSomeone, hopefully you, requested a password reset for {1}.\n\nPlease click the link below to reset your Dataverse account password:\n\n {2} \n\n The link above will only work for the next {3} minutes.\n\n Please contact us if you did not request this password reset or need further help.
+notification.email.passwordReset.subject=Dataverse Password Reset Requested
 hours=hours
 hour=hour
 minutes=minutes
@@ -609,6 +616,7 @@ notification.email.checksumfail.subject={0}: Your upload failed checksum validat
 notification.email.import.filesystem.subject=Dataset {0} has been successfully uploaded and verified
 notification.email.import.checksum.subject={0}: Your file checksum job has completed
 contact.delegation={0} on behalf of {1}
+notification.email.info.unavailable=Unavailable
 
 # passwordreset.xhtml
 pageTitle.passwdReset.pre=Account Password Reset
@@ -1109,6 +1117,8 @@ dataset.guestbooksResponses.dataset=Dataset
 dataset.guestbooksResponses.date=Date
 dataset.guestbooksResponses.type=Type
 dataset.guestbooksResponses.file=File
+dataset.guestbooksResponses.customQuestions=Custom Questions
+dataset.guestbooksResponses.user=User
 dataset.guestbooksResponses.tip.title=Guestbook Responses
 dataset.guestbooksResponses.count.responses={0} {0, choice, 0#Responses|1#Response|2#Responses}
 dataset.guestbooksResponses.count.toofresults={0} to {1} of {2} {2, choice, 0#Responses|1#Response|2#Responses}
@@ -1157,7 +1167,9 @@ dataset.exportBtn=Export Metadata
 dataset.exportBtn.itemLabel.ddi=DDI
 dataset.exportBtn.itemLabel.dublinCore=Dublin Core
 dataset.exportBtn.itemLabel.schemaDotOrg=Schema.org JSON-LD
+dataset.exportBtn.itemLabel.datacite=DataCite
 dataset.exportBtn.itemLabel.json=JSON
+dataset.exportBtn.itemLabel.oai_ore=OAI_ORE
 metrics.title=Metrics
 metrics.title.tip=View more metrics information
 metrics.comingsoon=Coming soon...
@@ -1172,7 +1184,7 @@ dataset.submitBtn=Submit for Review
 dataset.disabledSubmittedBtn=Submitted for Review
 dataset.submitMessage=You will not be able to make changes to this dataset while it is in review.
 dataset.submit.success=Your dataset has been submitted for review.
-dataset.inreview.infoMessage=\u2013 This dataset is currently under review prior to publication.
+dataset.inreview.infoMessage=The draft version of this dataset is currently under review prior to publication.
 dataset.submit.failure=Dataset Submission Failed - {0}
 dataset.submit.failure.null=Can't submit for review. Dataset is null.
 dataset.submit.failure.isReleased=Latest version of dataset is already released. Only draft versions can be submitted for review.
@@ -1208,6 +1220,7 @@ dataset.share.datasetShare=Share Dataset
 dataset.share.datasetShare.tip=Share this dataset on your favorite social media networks.
 dataset.share.datasetShare.shareText=View this dataset.
 dataset.locked.message=Dataset Locked
+dataset.locked.message.details=This dataset is locked until publication.
 dataset.locked.inReview.message=Submitted for Review
 dataset.publish.error=This dataset may not be published due to an error when contacting the  {0}  Service. Please try again.
 dataset.publish.error.doi=This dataset may not be published because the DOI update failed.
@@ -1224,8 +1237,9 @@ dataset.compute.computeBatchListHeader=Compute Batch
 dataset.compute.computeBatchRestricted=This dataset contains restricted files you may not compute on because you have not been granted access.
 dataset.delete.error=Could not deaccession the dataset because the {0} update failed.
 dataset.publish.worldMap.deleteConfirm=Please note that your data and map on WorldMap will be removed due to restricted file access changes in this dataset version which you are publishing. Do you want to continue?
-dataset.publish.workflow.inprogress=Publish workflow in progress
-dataset.pidRegister.workflow.inprogress=Register/update file persistent identifiers workflow in progress
+dataset.publish.workflow.message=Publish in Progress
+dataset.publish.workflow.inprogress=This dataset is locked until publication.
+dataset.pidRegister.workflow.inprogress=This dataset is locked while the file persistent identifiers are being registered or updated.
 dataset.versionUI.draft=Draft
 dataset.versionUI.inReview=In Review
 dataset.versionUI.unpublished=Unpublished
@@ -1246,7 +1260,9 @@ dataset.keywordDisplay.title=Keyword
 dataset.subjectDisplay.title=Subject
 dataset.contact.tip=Use email button above to contact.
 dataset.asterisk.tip=Asterisks indicate required fields
-dataset.message.uploadFiles=Upload Dataset Files - You can drag and drop files from your desktop, directly into the upload widget.
+dataset.message.uploadFiles.label=Upload Dataset Files
+dataset.message.uploadFilesSingle.message=For more information about supported file formats, please refer to the User Guide.
+dataset.message.uploadFilesMultiple.message=Multiple file upload/download methods are available for this dataset. Once you upload a file using one of these methods, your choice will be locked in for this dataset.
 dataset.message.editMetadata=Edit Dataset Metadata - Add more metadata about this dataset to help others easily find it.
 dataset.message.editTerms=Edit Dataset Terms - Update this dataset's terms of use.
 dataset.message.locked.editNotAllowedInReview=Dataset cannot be edited due to In Review dataset lock.
@@ -1322,25 +1338,24 @@ dataset.privateurl.roleassigeeTitle=Private URL Enabled
 dataset.privateurl.createdSuccess=Success!
 dataset.privateurl.disabledSuccess=You have successfully disabled the Private URL for this unpublished dataset.
 dataset.privateurl.noPermToCreate=To create a Private URL you must have the following permissions: {0}.
-
-
+file.count.one=1 File
 file.count={0} to {1} of {2} {2, choice, 0#Files|1#File|2#Files}
 file.count.shown={0} {0, choice, 0#Files Selected|1#File|2#Files}
-
-
 file.clearSelection=Clear selection.
 file.numFilesSelected={0} {0, choice, 0#files are|1#file is|2#files are} currently selected.
 file.selectAllFiles=Select all {0} files in this dataset.
 file.dynamicCounter.filesPerPage=Files Per Page
-
-
 file.selectToAddBtn=Select Files to Add
 file.selectToAdd.tipLimit=File upload limit is {0} per file. 
-file.selectToAdd.tipMoreInformation=For more information about supported file formats, please refer to the User Guide.
+file.selectToAdd.tipMoreInformation=Select files or drag and drop into the upload widget.
 file.selectToAdd.dragdropMsg=Drag and drop files here.
-file.createUploadDisabled=Once you have saved your dataset, you can upload your data using the "Upload Files" button on the dataset page. For more information about supported file formats, please refer to the User Guide.
+file.createUploadDisabled=Upload files using rsync via SSH. This method is recommended for large file transfers. The upload script will be available on the Upload Files page once you save this dataset.
+file.fromHTTP=Upload with HTTP via your browser
 file.fromDropbox=Upload from Dropbox
-file.fromDropbox.tip=Files can also be uploaded directly from Dropbox.
+file.fromDropbox.tip=Select files from Dropbox.
+file.fromRsync=Upload with rsync + SSH via Data Capture Module (DCM)
+file.api.httpDisabled=File upload via HTTP is not available for this installation of Dataverse.
+file.api.alreadyHasPackageFile=File upload via HTTP disabled since this dataset already contains a package file.
 file.replace.original=Original File
 file.editFiles=Edit Files
 file.editFilesSelected=Edit
@@ -1379,16 +1394,21 @@ file.cloudStorageAccess.tip=The container name for this dataset needed to access
 file.cloudStorageAccess.help=To directly access this data in the {2} cloud environment, use the container name in the Cloud Storage Access box below. To learn more about the cloud environment, visit the Cloud Storage Access section of the User Guide.
 file.copy=Copy
 file.compute=Compute
-file.rsyncUpload.info=Follow these steps to upload your data. To learn more about the upload process and how to prepare your data, please refer to the User Guide.
-file.rsyncUpload.noScriptAvailable=Rsync script not available!
-file.rsyncUpload.filesExist=You can not upload additional files to this dataset.
+file.rsyncUpload.info=Upload files using rsync + SSH. This method is recommended for large file transfers. Follow the steps below to upload your data. (User Guide - rsync Upload).
+file.rsyncUpload.filesExist=You cannot upload additional files to this dataset. A dataset can only hold one data package. If you need to replace the data package in this dataset, please contact {0}.
+file.rsyncUpload.noScriptBroken=The Data Capture Module failed to generate the rsync script. Please contact {0}.
+file.rsyncUpload.noScriptBusy=Currently generating rsync script. If the script takes longer than ten minutes to generate, please contact {0}.
 file.rsyncUpload.step1=Make sure your data is stored under a single directory. All files within this directory and its subdirectories will be uploaded to your dataset.
 file.rsyncUpload.step2=Download this file upload script:
-file.rsyncUpload.step2.downloadScriptButton=Download Script
+file.rsyncUpload.step2.downloadScriptButton=Download DCM Script
 file.rsyncUpload.step3=Open a terminal window in the same directory you saved the script and run this command: bash ./{0}
 file.rsyncUpload.step4=Follow the instructions in the script. It will ask for a full path (beginning with "/") to the directory containing your data. Note: this script will expire after 7 days.
-file.rsyncUpload.inProgressMessage.summary=DCM File Upload
-file.rsyncUpload.inProgressMessage.details=This dataset is locked until the data files have been transferred and verified.
+file.rsyncUpload.inProgressMessage.summary=File Upload in Progress
+file.rsyncUpload.inProgressMessage.details=This dataset is locked while the data files are being transferred and verified.
+file.rsyncUpload.httpUploadDisabledDueToRsyncFileExisting=HTTP upload is disabled for this dataset because you have already uploaded files via rsync. If you would like to switch to HTTP upload, please contact {0}.
+file.rsyncUpload.httpUploadDisabledDueToRsyncFileExistingAndPublished=HTTP upload is disabled for this dataset because you have already uploaded files via rsync and published the dataset.
+file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp=Upload with rsync + SSH is disabled for this dataset because you have already uploaded files via HTTP. If you would like to switch to rsync upload, then you must first remove all uploaded files from this dataset. Once this dataset is published, the chosen upload method is permanently locked in.
+file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttpAndPublished=Upload with rsync + SSH is disabled for this dataset because you have already uploaded files via HTTP and published the dataset.
 
 file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
@@ -1603,6 +1623,8 @@ file.dataset.allFiles=All Files from this Dataset
 file.downloadDialog.header=Dataset Terms
 file.downloadDialog.tip=Please confirm and/or complete the information needed below in order to continue.
 file.requestAccessTermsDialog.tip=Please confirm and/or complete the information needed below in order to request access to files in this dataset.
+file.requestAccess.notAllowed=Requests for access are not accepted on the Dataset.
+
 file.search.placeholder=Search this dataset...
 file.results.btn.sort=Sort
 file.results.btn.sort.option.nameAZ=Name (A-Z)
@@ -1680,6 +1702,7 @@ file.DatasetVersion=Version
 file.metadataTab.fileMetadata.header=File Metadata
 file.metadataTab.fileMetadata.persistentid.label=Data File Persistent ID
 file.metadataTab.fileMetadata.downloadUrl.label=Download URL
+file.metadataTab.fileMetadata.downloadUrl.info=Use the Download URL in a Wget command or a download manager to avoid interrupted downloads, time outs or other failures. User Guide - Downloading via URL
 file.metadataTab.fileMetadata.unf.label=File UNF
 file.metadataTab.fileMetadata.size.label=Size
 file.metadataTab.fileMetadata.type.label=Type
@@ -1913,7 +1936,7 @@ dataverse.item.required=Required
 dataverse.item.optional=Optional
 dataverse.item.hidden=Hidden
 dataverse.edit.msg=Edit Dataverse
-dataverse.edit.detailmsg= - Edit your dataverse and click Save. Asterisks indicate required fields.
+dataverse.edit.detailmsg=Edit your dataverse and click Save Changes. Asterisks indicate required fields.
 dataverse.feature.update=The featured dataverses for this dataverse have been updated.
 dataverse.link.select=You must select a linking dataverse.
 dataset.noSelectedDataverse.header=Select Dataverse(s)
@@ -2016,6 +2039,8 @@ permission.roleWas=The role was {0}. To assign it to a user and/or group, click
 permission.roleNotSaved=The role was not able to be saved.
 permission.permissionsMissing=Permissions {0} missing.
 permission.CannotAssigntDefaultPermissions=Cannot assign default permissions.
+permission.default.contributor.role.none.decription=A person who has no permissions on a newly created dataset. Not recommended for dataverses with human contributors. 
+permission.default.contributor.role.none.name=None
 
 #ManageFilePermissionsPage.java
 permission.roleNotAbleToBeRemoved=The role assignment was not able to be removed.
@@ -2063,3 +2088,173 @@ admin.api.migrateHDL.failure.must.be.hdl.dataset=Dataset was not registered as a
 admin.api.migrateHDL.success=Dataset migrate HDL registration complete. Dataset re-registered successfully.
 admin.api.migrateHDL.failure=Failed to migrate Dataset Handle id: {0}
 admin.api.migrateHDL.failureWithException=Failed to migrate Dataset Handle id: {0} Unexpected exception: {1}
+
+#Datasets.java
+datasets.api.updatePIDMetadata.failure.dataset.must.be.released=Modify Registration Metadata must be run on a published dataset.
+datasets.api.updatePIDMetadata.auth.mustBeSuperUser=Forbidden. You must be a superuser.
+datasets.api.updatePIDMetadata.success.for.single.dataset=Dataset {0} PID Metadata updated successfully.
+datasets.api.updatePIDMetadata.success.for.update.all=All Dataset PID Metadata update completed successfully.
+
+#Dataverses.java
+dataverses.api.update.default.contributor.role.failure.role.not.found=Role {0} not found.
+dataverses.api.update.default.contributor.role.success=Default contributor role for Dataverse {0} has been set to {1}.
+dataverses.api.update.default.contributor.role.failure.role.does.not.have.dataset.permissions=Role {0} does not have dataset permissions.
+#Access.java
+access.api.allowRequests.failure.noDataset=Could not find Dataset with id: {0}
+access.api.allowRequests.failure.noSave=Problem saving dataset {0}: {1}
+access.api.allowRequests.allows=allows
+access.api.allowRequests.disallows=disallows
+access.api.allowRequests.success=Dataset {0} {1} file access requests.
+access.api.fileAccess.failure.noUser=Could not find user to execute command: {0}
+access.api.requestAccess.failure.commandError=Problem trying request access on {0} : {1}
+access.api.requestAccess.failure.requestExists=An access request for this file on your behalf already exists.
+access.api.requestAccess.failure.invalidRequest=You may not request access to this file. It may already be available to you.
+access.api.requestAccess.noKey=You must provide a key to request access to a file. 
+access.api.requestAccess.fileNotFound=Could not find datafile with id {0}.
+access.api.requestAccess.invalidRequest=This file is already available to you for download or you have a pending request
+access.api.requestAccess.requestsNotAccepted=Requests for access are not accepted on the Dataset.
+access.api.requestAccess.success.for.single.file=Access to File {0} requested.
+access.api.rejectAccess.failure.noPermissions=Requestor does not have permission to manage file download requests.
+access.api.grantAccess.success.for.single.file=Access to File {0} granted.
+access.api.grantAccess.noAssigneeFound=Could not find assignee with identifier {0}.
+access.api.grantAccess.failure.commandError=Problem trying grant access on {0} : {1}
+access.api.fileAccess.rejectFailure.noRequest=No request for access to file {0} for user {1}
+access.api.rejectAccess.success.for.single.file=Access to File {0} rejected.
+access.api.revokeAccess.noRoleFound=No File Downloader role found for user {0}
+access.api.revokeAccess.success.for.single.file=File Downloader access has been revoked for user {0} on file {1}
+access.api.requestList.fileNotFound=Could not find datafile with id {0}.
+access.api.requestList.noKey=You must provide a key to get list of access requests for a file. 
+access.api.requestList.noRequestsFound=There are no access requests for this file {0}.
+
+#permission
+permission.AddDataverse.label=AddDataverse
+permission.AddDataset.label=AddDataset
+permission.ViewUnpublishedDataverse.label=ViewUnpublishedDataverse
+permission.ViewUnpublishedDataset.label=ViewUnpublishedDataset
+permission.DownloadFile.label=DownloadFile
+permission.EditDataverse.label=EditDataverse
+permission.EditDataset.label=EditDataset
+permission.ManageDataversePermissions.label=ManageDataversePermissions
+permission.ManageDatasetPermissions.label=ManageDatasetPermissions
+permission.PublishDataverse.label=PublishDataverse
+permission.PublishDataset.label=PublishDataset
+permission.DeleteDataverse.label=DeleteDataverse
+permission.DeleteDatasetDraft.label=DeleteDatasetDraft
+
+permission.AddDataverse.desc=Add a dataverse within another dataverse
+permission.DeleteDatasetDraft.desc=Delete a dataset draft
+permission.DeleteDataverse.desc=Delete an unpublished dataverse
+permission.PublishDataset.desc=Publish a dataset
+permission.PublishDataverse.desc=Publish a dataverse
+permission.ManageDatasetPermissions.desc=Manage permissions for a dataset
+permission.ManageDataversePermissions.desc=Manage permissions for a dataverse
+permission.EditDataset.desc=Edit a dataset's metadata
+permission.EditDataverse.desc=Edit a dataverse's metadata, facets, customization, and templates 
+permission.DownloadFile.desc=Download a file
+permission.ViewUnpublishedDataset.desc=View an unpublished dataset and its files
+permission.ViewUnpublishedDataverse.desc=View an unpublished dataverse
+permission.AddDataset.desc=Add a dataset to a dataverse
+
+packageDownload.title=Package File Download
+packageDownload.instructions=Use the Download URL in a Wget command or a download manager to download this package file. Download via web browser is not recommended. User Guide - Downloading a Dataverse Package via URL
+packageDownload.urlHeader=Download URL
+
+#mydata_fragment.xhtml
+Published=Published
+Unpublished=Unpublished
+Draft=Draft
+In\u0020Review=In Review
+Deaccessioned=Deaccessioned
+
+#Managegroupspage.java
+dataverse.manageGroups.user=user
+dataverse.manageGroups.users=users
+dataverse.manageGroups.group=group
+dataverse.manageGroups.groups=groups
+dataverse.manageGroups.nomembers=No Members
+dataverse.manageGroups.unknown=unknown
+dataverse.manageGroups.User=User
+dataverse.manageGroups.Group=Group
+
+#editFilesFragment.xhtml
+editfilesfragment.mainlabel=Select Language Encoding...
+editfilesfragment.label1=West European
+editfilesfragment.label1.item1=Western (ISO-8859-1)
+editfilesfragment.label1.item2=Western (ISO-8859-15)
+editfilesfragment.label1.item3=Western (Windows-1252)
+editfilesfragment.label1.item4=Western (MacRoman)
+editfilesfragment.label1.item5=Western (IBM-850)
+editfilesfragment.label1.item6=Celtic (ISO-8859-14)
+editfilesfragment.label1.item7=Greek (ISO-8859-7)
+editfilesfragment.label1.item8=Greek (Windows-1253)
+editfilesfragment.label1.item9=Greek (MacGreek)
+editfilesfragment.label1.item10=Icelandic (MacIcelandic)
+editfilesfragment.label1.item11=Nordic (ISO-8859-10)
+editfilesfragment.label1.item12=South European (ISO-8859-3)
+editfilesfragment.label2=East European
+editfilesfragment.label2.item1=Baltic (ISO-8859-4)
+editfilesfragment.label2.item2=Baltic (ISO-8859-13)
+editfilesfragment.label2.item3=Baltic (Windows-1257)
+editfilesfragment.label2.item4=Cyrillic (ISO-8859-5)
+editfilesfragment.label2.item5=Cyrillic (ISO-IR-111)
+editfilesfragment.label2.item6=Cyrillic (Windows-1251)
+editfilesfragment.label2.item7=Cyrillic (MacCyrillic)
+editfilesfragment.label2.item8=Cyrillic/Ukrainian (MacUkrainian)
+editfilesfragment.label2.item9=Cyrillic (KOI8-R)
+editfilesfragment.label2.item10=Cyrillic/Ukrainian (KOI8-U)
+editfilesfragment.label2.item11=Croatian (MacCroatian)
+editfilesfragment.label2.item12=Romanian (MacRomanian)
+editfilesfragment.label2.item13=Romanian (ISO-8859-16)
+editfilesfragment.label2.item14=Central European (ISO-8859-2)
+editfilesfragment.label2.item15=Central European (Windows-1250)
+editfilesfragment.label2.item16=Central European (MacCE)
+editfilesfragment.label2.item17=Cyrillic (IBM-855)
+editfilesfragment.label3=East Asian
+editfilesfragment.label3.item1=Japanese (ISO-2022-JP)
+editfilesfragment.label3.item2=Japanese (Shift_JIS)
+editfilesfragment.label3.item3=Japanese (EUC-JP)
+editfilesfragment.label3.item4=Chinese Traditional (Big5)
+editfilesfragment.label3.item5=Chinese Traditional (Big5-HKSCS)
+editfilesfragment.label3.item6=Chinese Traditional (EUC-TW)
+editfilesfragment.label3.item7=Chinese Simplified (GB2312)
+editfilesfragment.label3.item8=Chinese Simplified (HZ)
+editfilesfragment.label3.item9=Chinese Simplified (GBK)
+editfilesfragment.label3.item10=Chinese Simplified (ISO-2022-CN)
+editfilesfragment.label3.item11=Korean (EUC-KR)
+editfilesfragment.label3.item12=Korean (JOHAB)
+editfilesfragment.label3.item13=Korean (ISO-2022-KR)
+editfilesfragment.label4=Unicode
+editfilesfragment.label4.item1=Unicode (UTF-8)
+editfilesfragment.label4.item2=Unicode (UTF-16LE)
+editfilesfragment.label4.item3=Unicode (UTF-16BE)
+editfilesfragment.label5=US-ASCII
+
+isrequired=is required.
+draftversion=DRAFT VERSION
+deaccessionedversion=DEACCESSIONED VERSION
+
+not_restricted=Not Restricted
+editdatafilepage.defaultLanguageEncoding=UTF8 (default)
+passwdVal.passwdReq.each=each
+passwdVal.passwdReq.uppercase=uppercase
+passwdVal.passwdReq.lowercase=lowercase
+passwdVal.passwdReq.letter=letter
+passwdVal.passwdReq.numeral=numeral
+passwdVal.passwdReq.special=special
+dataretrieverAPI.noMsgResultsFound=Sorry, no results were found.
+
+#xlsxfilereader.java
+xlsxfilereader.ioexception.parse=Could not parse Excel/XLSX spreadsheet. {0}
+xlsxfilereader.ioexception.norows=No rows of data found in the Excel (XLSX) file.
+xlsxfilereader.ioexception.onlyonerow=Only one row of data (column name header?) detected in the Excel (XLSX) file.
+xlsxfilereader.ioexception.failed=Failed to read line {0} during the second pass.
+xlsxfilereader.ioexception.mismatch=Reading mismatch, line {0} during the second pass: {1} delimited values expected, {2} found.
+xlsxfilereader.ioexception.linecount=Mismatch between line counts in first and final passes!
+
+#rtabfileparser.java
+rtabfileparser.ioexception.failed=Failed to read line {0} of the Data file.
+rtabfileparser.ioexception.mismatch=Reading mismatch, line {0} of the Data file: {1} delimited values expected, {2} found.
+rtabfileparser.ioexception.boolean=Unexpected value for the Boolean variable ({0}): 
+rtabfileparser.ioexception.read=Couldn't read Boolean variable ({0})!
+rtabfileparser.ioexception.parser1=R Tab File Parser: Could not obtain varQnty from the dataset metadata.
+rtabfileparser.ioexception.parser2=R Tab File Parser: varQnty=0 in the dataset metadata!
diff --git a/src/main/java/Bundle_fr.properties b/src/main/java/Bundle_fr.properties
index 8b6ec5df332..28e24dde98f 100644
--- a/src/main/java/Bundle_fr.properties
+++ b/src/main/java/Bundle_fr.properties
@@ -12,6 +12,7 @@ restricted=En acc
 restrictedaccess=Accs rserv
 find=Chercher
 search=Recherche
+language=Langue
 unpublished=Non publi
 cancel=Annuler
 ok=ok
@@ -39,9 +40,11 @@ remove=Supprimer
 done=Termin
 editor=Collaborateur
 manager=Gestionnaire
-curator=Intendant des donnes
+curator=Curateur
 explore=Explorer
 download=Tlcharger
+downloadOriginal=Format original
+downloadArchival=Format d'archivage (.tab)
 deaccession=Retrait
 share=Partager
 link=Lier
@@ -132,20 +135,21 @@ contact.contact=Personne-ressource
 # Bundle file editors, please note that these "contact.context" messages are used in tests.
 contact.context.subject.dvobject={0} Personne-ressource\u00A0: {1}
 contact.context.subject.support={0} Demande de soutien\u00A0: {1}
-contact.context.dataverse.intro={0}Vous venez de recevoir le message suivant de {1} via le dataverse hberg {2} nomm \u00A0{3}\u00A0\u00A0:\n\n---\n\n
+contact.context.dataverse.intro={0}Vous venez de recevoir le message suivant de {1} concernant le dataverse inclus dans {2} et nomm \u00A0{3}\u00A0\u00A0:\n\n---\n\n
 contact.context.dataverse.ending=\n\n---\n\n{0}\n{1}\n\nAccder au dataverse {2}/dataverse/{3}\n\nVous avez reu ce courriel car vous avez t enregistr en tant que personne-ressource pour le dataverse. Si vous pensez qu''il s''agit d''une erreur, veuillez contacter {4}  {5}. Pour rpondre directement  la personne qui a envoy le message, rpondez simplement  ce courriel.
 contact.context.dataverse.noContact=Il n'y a pas d'adresse de contact enregistre pour ce dataverse. Par consquent ce message est envoy  l'adresse du systme.\n\n
 contact.context.dataset.greeting.helloFirstLast=Bonjour {0} {1},
 contact.context.dataset.greeting.organization= l'attention de la personne-ressource de l'ensemble de donnes\u00A0:
-contact.context.dataset.intro={0}\n\nVous venez de recevoir le message suivant de {1} via l''ensemble de donnes hberg {2} nomm \u00A0{3}\u00A0 ({4})\u00A0:\n\n---\n\n
+contact.context.dataset.intro={0}\n\nVous venez de recevoir le message suivant de {1} concernant l''ensemble de donnes inclus dans {2} et intitul \u00A0{3}\u00A0 ({4})\u00A0:\n\n---\n\n
 contact.context.dataset.ending=\n\n---\n\n{0}\n{1}\n\nAccder  l''ensemble de donnes {2}/dataset.xhtml?persistentId={3}\n\nVous avez reu ce courriel car vous avez t enregistr en tant que personne-ressource pour l''ensemble de donnes. Si vous pensez qu''il s''agit d''une erreur, veuillez contacter {4}  {5}. Pour rpondre directement  la personne qui a envoy le message, rpondez simplement  ce courriel.
 contact.context.dataset.noContact=Il n'y a pas d'adresse de contact enregistre pour ce ensemble de donnes. Par consquent ce message est envoy  l'adresse du systme.\n\n---\n\n
 contact.context.file.intro={0}\n\nVous venez de recevoir le message suivant de {1} via le fichier hberg {2} nomm \u00A0{3}\u00A0 provenant de l''ensemble de donnes nomm \u00A0{4}\u00A0 ({5})\u00A0:\n\n---\n\n
-contact.context.file.ending=\n\n---\n\n{0}\n{1}\n\nAccder au fichier {2}/file.xhtml?fileId={3}\n\nVous avez reu ce courriel car vous avez t enregistr en tant que personne-ressource pour l''ensemble de donnes. Si vous pensez qu''il s''agit d'une erreur, veuillez contacter {4}  {5}. Pour rpondre directement  la personne qui a envoy le message, rpondez simplement  ce courriel.
+contact.context.file.ending=\n\n---\n\n{0}\n{1}\n\nAccder au fichier {2}/file.xhtml?fileId={3}\n\nVous avez reu ce courriel car vous avez t enregistr en tant que personne-ressource pour l''ensemble de donnes. Si vous pensez qu''il s''agit d''une erreur, veuillez contacter {4}  {5}. Pour rpondre directement  la personne qui a envoy le message, rpondez simplement  ce courriel.
 contact.context.support.intro={0},\n\nLe message suivant a t envoy depuis {1}.\n\n---\n\n
 contact.context.support.ending=\n\n---\n\nMessage envoy depuis le formulaire de demande de soutien.
 
 # dataverseuser.xhtml
+institution.name=Une instance de Dataverse
 account.info=Renseignements sur le compte
 account.edit=Modifier le compte
 account.apiToken=Jeton API
@@ -154,7 +158,7 @@ user.helpShibUserMigrateOffShibBeforeLink=Vous quittez votre 
 user.helpShibUserMigrateOffShibAfterLink=pour obtenir de l'aide.
 user.helpOAuthBeforeLink=Votre compte Dataverse utilise {0} pour pouvoir se connecter. Si vous souhaitez modifier vos modes de connexion, prire de contacter
 user.helpOAuthAfterLink=pour obtenir du soutien.
-user.lostPasswdTip=Si vous avez perdu ou oubli votre mot de passe, indiquez votre nom d'utilisateur ou votre adresse courriel dans l'espace ci-dessous et cliquez sur \u00A0Soumettre\u00A0. Nous vous enverrons votre nouveau mot de passe par courriel.
+user.lostPasswdTip=Si vous avez perdu ou oubli votre mot de passe, indiquer votre nom d'utilisateur ou votre adresse courriel dans l'espace ci-dessous et cliquer sur \u00A0Soumettre\u00A0. Nous vous enverrons votre nouveau mot de passe par courriel.
 user.dataRelatedToMe=Mes donnes
 wasCreatedIn=a t cr dans
 wasCreatedTo=a t ajout 
@@ -170,11 +174,11 @@ notification.demoSite=site de d
 notification.requestFileAccess=Demande d'accs pour l''ensemble de donnes\u00A0: {0}.
 notification.grantFileAccess=Accs accord pour les fichiers de l''ensemble de donnes\u00A0: {0}.
 notification.rejectFileAccess=Demande d''accs refuse pour les fichiers de l''ensemble de donnes\u00A0: {0}.
-notification.createDataverse={0} a t cr dans {1}. Pour savoir ce que vous pouvez faire avec votre dataverse, consultez le {2}.
+notification.createDataverse={0} a t cr dans {1}. Pour savoir ce que vous pouvez faire avec votre dataverse, consulter le {2}.
 notification.dataverse.management.title=Administration de Dataverse \u2014 Guide d'utilisation de Dataverse
-notification.createDataset={0} a t cr dans {1}. Pour savoir ce que vous pouvez faire avec votre ensemble de donnes, consultez le {2}.
+notification.createDataset={0} a t cr dans {1}. Pour savoir ce que vous pouvez faire avec votre ensemble de donnes, consulter le {2}.
 notification.dataset.management.title=Administration des ensembles de donnes \u2014 Guide d'utilisation pour les ensembles de donnes
-notification.wasSubmittedForReview={0} a t soumis pour vrification avant publication dans {1}. N''oubliez pas de le publier ou de le renvoyer au collaborateur\!
+notification.wasSubmittedForReview={0} a t soumis pour vrification avant publication dans {1}. N''oubliez pas de le publier ou de le renvoyer au collaborateur ({2}  {3})\!
 notification.wasReturnedByReviewer={0} a t retourn par l''intendant des donnes de {1}.
 notification.wasPublished={0} a t publi dans {1}.
 notification.worldMap.added={0}, cet ensemble de donnes dispose maintenant d''une couche de donnes WorldMap.
@@ -188,7 +192,7 @@ notification.access.granted.fileDownloader.additionalDataset={0} Vous avez maint
 notification.access.revoked.dataverse=Votre rle dans {0} a t retir.
 notification.access.revoked.dataset=Votre rle dans {0} a t retir.
 notification.access.revoked.datafile=Votre rle dans {0} a t retir.
-notification.checksumfail=La validation de la somme de contrle pour l''ensemble de donnes {0} a chou pour un ou plus d''un fichier(s) tlvers(s). Veuillez relancer le script de tlversement. Si le problme persiste, prire de consulter le service de soutien.
+notification.checksumfail=La validation de la somme de contrle pour l''ensemble de donnes {1} a chou pour un ou plus d''un fichier(s) tlvers(s). Veuillez relancer le script de tlversement. Si le problme persiste, prire de contacter le service de soutien.
 notification.mail.import.filesystem=L''ensemble de donnes {2} ({0}/dataset.xhtml?persistentId={1}) a bien t tlvers et vrifi.
 notification.import.filesystem=L''ensemble de donnes {1} a bien t tlvers et vrifi.
 notification.import.checksum={1}, l''ensemble de donnes a ajout les sommes de contrle des fichiers par l''entremise d''un traitement en lot.
@@ -200,7 +204,7 @@ user.username.illegal.tip=Votre nom d'utilisateur doit compter entre 2 et 60\u00
 user.username=Nom d'utilisateur
 user.username.taken=Ce nom d'utilisateur est dj pris.
 user.username.invalid=Ce nom d'utilisateur contient un caractre invalide ou enfreint la limite de longueur (2  60 caractres).
-user.username.valid=Crez un nom d'utilisateur valide de 2  60 caractres contenant des lettres (a-Z), des chiffres (0-9), des tirets (-), des traits de soulignements (_) et des points (.).
+user.username.valid=Crer un nom d'utilisateur valide de 2  60 caractres pouvant contenir des lettres (a-Z), des chiffres (0-9), des tirets (-), des traits de soulignements (_) et des points (.).
 user.noPasswd=Aucun mot de passe
 user.currentPasswd=Mot de passe actuel
 user.currentPasswd.tip=Veuillez entrer le mot de passe actuel pour ce compte.
@@ -229,7 +233,7 @@ user.newPassword=Nouveau mot de passe
 authenticationProvidersAvailable.tip={0}Il n''y a aucun systme d''authentification actif{1}Si vous tes administrateur systme, veuillez en autoriser un au moyen de l''API.{2}Si vous n''tes pas administrateur systme, veuillez communiquer avec celui de votre tablissement. 
 
 passwdVal.passwdReq.title=Votre mot de passe doit contenir\u00A0:
-passwdVal.passwdReq.goodStrength =Les mots de passe d'un minimum de {0} caractres sont exempts de tout autre exigence
+passwdVal.passwdReq.goodStrength =Les mots de passe d''un minimum de {0} caractres sont exempts de tout autre exigence
 passwdVal.passwdReq.lengthReq =Au minimum {0} caractres 
 passwdVal.passwdReq.characteristicsReq =Au moins un caractre provenant de {0} des types suivants\u00A0:
 passwdVal.passwdReq.notInclude =Il ne doit pas contenir\u00A0:
@@ -243,6 +247,7 @@ passwdVal.goodStrengthRule.errorMsg =Remarque\u00A0: les mots de passe d'une lon
 passwdVal.goodStrengthRule.errorCode =PEU SR
 passwdVal.passwdReset.resetLinkTitle =Lien pour la rinitialisation du mot de passe
 passwdVal.passwdReset.resetLinkDesc =Le lien de rinitialisation de votre mot de passe n'est pas valide
+passwdVal.passwdReset.resetInitiated=Rinitialisation du mot de passe amorce
 passwdVal.passwdReset.valBlankLog =Le nouveau mot de passe est vide
 passwdVal.passwdReset.valFacesError =Erreur de mot de passe
 passwdVal.passwdReset.valFacesErrorDesc =Veuillez entrer un nouveau mot de passe pour votre compte.
@@ -261,6 +266,9 @@ login.institution.support.afterLink=pour obtenir de l'aide.
 login.builtin.credential.usernameOrEmail=Nom d'utilisateur/courriel
 login.builtin.credential.password=Mot de passe
 login.builtin.invalidUsernameEmailOrPassword=Le nom d'utilisateur, le courriel ou le mot de passe indiqu n'est pas valide. Avez-vous besoin d'aide pour accder  votre compte?
+login.echo.credential.name=Nom
+login.echo.credential.email=Courriel
+login.echo.credential.affiliation=Affiliation
 # how do we exercise login.error? Via a password upgrade failure? See https://github.com/IQSS/dataverse/pull/2922
 login.error=Une erreur s'est produite au moment de la validation du nom d'utilisateur ou du mot de passe. Veuillez essayer  nouveau. Si le problme persiste, communiquez avec un administrateur.
 user.error.cannotChangePassword=Dsol, votre mot de passe ne peut pas tre modifi. Veuillez contacter votre administrateur systme.
@@ -360,7 +368,7 @@ oauth2.callback.message=Erreur d''authentification \u2014 Datav
 
 # tab on dataverseuser.xhtml
 apitoken.title=Jeton API
-apitoken.message=Votre jeton API sera affich ci-aprs une fois qu''il aura t cr. Consultez notre {0}guide API{1} pour obtenir plus de dtails sur comment utiliser votre jeton API avec les API de Dataverse.
+apitoken.message=Votre jeton API sera affich ci-aprs une fois qu''il aura t cr. Consulter notre {0}guide API{1} pour obtenir plus de dtails sur comment utiliser votre jeton API avec les API de Dataverse.
 apitoken.notFound=Le jeton API pour {0} n''a pas t cr.
 apitoken.generateBtn=Crer le jeton
 apitoken.regenerateBtn=Crer de nouveau le jeton
@@ -369,20 +377,20 @@ apitoken.regenerateBtn=Cr
 dashboard.title=Tableau de bord
 dashboard.card.harvestingclients.header=Clients de moissonnage
 dashboard.card.harvestingclients.btn.manage=Gestion des clients
-dashboard.card.harvestingclients.clients={0, choice, 0#Clients|1#Client|2#Clients}
-dashboard.card.harvestingclients.datasets={0, choice, 0#Ensembles de donnes|1#Ensemble de donnest|2#Ensembles de donnes}
+dashboard.card.harvestingclients.clients={0, choice, 0#Client|1#Client|2#Clients}
+dashboard.card.harvestingclients.datasets={0, choice, 0#Ensemble de donnes|1#Ensemble de donnes|2#Ensembles de donnes}
 dashboard.card.harvestingserver.header=Serveur de moissonnage 
 dashboard.card.harvestingserver.enabled=Serveur OAI activ
 dashboard.card.harvestingserver.disabled=Serveur OAI dsactiv
 dashboard.card.harvestingserver.status=Statut
-dashboard.card.harvestingserver.sets={0, choice, 0#Ensembles|1#Ensemble|2#Ensembles}
+dashboard.card.harvestingserver.sets={0, choice, 0#Ensemble|1#Ensemble|2#Ensembles}
 dashboard.card.harvestingserver.btn.manage=Gestion du serveur
 dashboard.card.metadataexport.header=Exportation des mtadonnes
-dashboard.card.metadataexport.message=L''exportation des mtadonnes de l''ensemble de donnes n''est disponible que via l''API de {0}. Pour en apprendre davantage, consultez le {1}Guide API{2} du {0}.
+dashboard.card.metadataexport.message=L''exportation des mtadonnes de l''ensemble de donnes n''est disponible que via l''API de {0}. Pour en apprendre davantage, consulter le {1}Guide API{2} du {0}.
 
 #harvestclients.xhtml
 harvestclients.title=Administration du moissonnage de clients
-harvestclients.toptip= \u2014 Le moissonnage peut tre planifi pour s'excuter selon un horaire spcifique ou  la demande. Le moissonnage peut tre lanc ici ou  partir de l'API REST.
+harvestclients.toptip=Le moissonnage peut tre planifi pour s'excuter selon un horaire spcifique ou  la demande. Le moissonnage peut tre lanc ici ou  partir de l'API REST.
 harvestclients.noClients.label=Aucun client n'est configur.
 harvestclients.noClients.why.header=Qu'est-ce que le moissonnage?
 harvestclients.noClients.why.reason1=Le moissonnage consiste  changer des mtadonnes avec d'autres dpts. En tant que  client de moissonnage, votre Dataverse peut recueillir les mtadonnes de notices provenant de sources distantes. Il peut s'agir d'autres instances de Dataverse, ou encore de dpts compatibles avec le protocole OAI-PMH, soit le protocole standard de moissonnage. 
@@ -390,7 +398,7 @@ harvestclients.noClients.why.reason2=Les notices de m
 harvestclients.noClients.how.header=Comment effectuer le moissonnage
 harvestclients.noClients.how.tip1=Afin de pouvoir moissonner des mtadonnes, un client de moissonnage doit tre dfini et paramtr pour chacun des dpts distants. Veuillez noter que pour dfinir un client, vous devrez slectionner un dataverse local dj existant, lequel hbergera les ensembles de donnes moissonns.
 harvestclients.noClients.how.tip2=Les notices rcoltes peuvent tre synchronises avec le dpt d'origine  l'aide de mises  jour incrmentielles programmes, par exemple, quotidiennes ou hebdomadaires. Alternativement, les moissonnages peuvent tre excuts  la demande,  partir de cette page ou via l'API REST.
-harvestclients.noClients.getStarted=Pour commencer, cliquez sur le bouton \u00A0Ajouter un client\u00A0 ci-dessus. Pour en apprendre davantage sur le moissonnage, consultez la section moissonnage du guide d''utilisation.
+harvestclients.noClients.getStarted=Pour commencer, cliquez sur le bouton \u00A0Ajouter un client\u00A0 ci-dessus. Pour en apprendre davantage sur le moissonnage, consulter la section moissonnage du guide d''utilisation.
 harvestclients.btn.add=Ajouter un client
 harvestclients.tab.header.name=Alias
 harvestclients.tab.header.url=Adresse URL
@@ -404,7 +412,7 @@ harvestclients.tab.header.action.btn.delete.dialog.header=Supprimer le client de
 harvestclients.tab.header.action.btn.delete.dialog.warning=Voulez-vous vraiment supprimer le client de moissonnage \u00A0{0}\u00A0? La suppression du client supprimera tous les ensembles de donnes rcolts  partir de ce serveur distant.
 harvestclients.tab.header.action.btn.delete.dialog.tip=Veuillez noter que cette opration peut prendre un certain temps  effectuer en fonction du nombre d'ensembles de donnes rcolts.
 harvestclients.tab.header.action.delete.infomessage=La suppression du client de moissonnage est lance. Notez que cela peut prendre un certain temps en fonction de la quantit de contenu rcolt.
-harvestclients.actions.runharvest.success=Lancement russi d''un moissonnage asynchrone pour le client \u00A0{0}\u00A0. Veuillez recharger la page pour vrifier les rsultats de la rcolte.
+harvestclients.actions.runharvest.success=Lancement russi d'un moissonnage asynchrone pour le client \u00A0{0}\u00A0. Veuillez recharger la page pour vrifier les rsultats de la rcolte.
 harvestclients.newClientDialog.step1=tape 1 de 4 \u2014 Renseignements au sujet du client
 harvestclients.newClientDialog.title.new=Dfinir un client de moissonnage
 harvestclients.newClientDialog.help=Configurer un client pour moissonner le contenu d'un serveur distant
@@ -461,7 +469,7 @@ harvestclients.newClientDialog.harvestingStyle.helptext=S
 harvestclients.viewEditDialog.title=Modifier le client de moissonnage
 harvestclients.viewEditDialog.archiveUrl=URL du dpt
 harvestclients.viewEditDialog.archiveUrl.tip=L'URL du dpt qui fournit les donnes moisssonnes par ce client, laquelle est utilise dans les rsultats de recherche pour les liens vers les sources originales du contenu moissonn. 
-harvestclients.viewEditDialog.archiveUrl.helptext=Modifier si cet URL est diffrent de l'URL du serveur.
+harvestclients.viewEditDialog.archiveUrl.helptext=Modifier si cette URL est diffrente de l'URL du serveur.
 harvestclients.viewEditDialog.archiveDescription=Description du dpt
 harvestclients.viewEditDialog.archiveDescription.tip=Description du dpt source du contenu moissonn et affich dans les rsultats de recherche.
 harvestclients.viewEditDialog.archiveDescription.default.generic=Cet ensemble de de donnes est moissonn auprs de nos partenaires. En cliquant sur le lien, vous accdez directement au dpt source des donnes.
@@ -470,7 +478,7 @@ harvestclients.newClientDialog.title.edit=Modifier le groupe {0}
 
 #harvestset.xhtml
 harvestserver.title=Administration du serveur de moissonnage
-harvestserver.toptip=\u2014 Dfinir les collections d'ensembles de donnes locaux qui seront disponibles pour le moissonnage par les clients distants.
+harvestserver.toptip=Dfinir les collections d'ensembles de donnes locaux qui seront disponibles pour le moissonnage par les clients distants.
 harvestserver.service.label=Serveur OAI
 harvestserver.service.enabled=Activ
 harvestserver.service.disabled=Dsactiv
@@ -482,15 +490,17 @@ harvestserver.noSets.why.reason1=Le moissonnage consiste 
 harvestserver.noSets.why.reason2=Seuls les ensembles de donnes publis et non restreints de votre Dataverse peuvent tre moissonns. Les clients distants maintiennent normalement leurs enregistrements synchroniss grce  des mises  jour incrmentielles programmes, quotidiennes ou hebdomadaires, rduisant ainsi la charge sur votre serveur. Notez que seules les mtadonnes sont moissonnes. Les moissonneurs distants ne tentent gnralement pas de tlcharger eux-mmes les fichiers de donnes.
 harvestserver.noSets.how.header=Comment activer un serveur de moissonnage?
 harvestserver.noSets.how.tip1=Le serveur de moissonnage peut tre activ ou dsactiv  partir de cette page. 
-harvestserver.noSets.how.tip2=Une fois le service activ, vous pouvez dfinir des collections d'ensembles de donnes locaux qui seront disponibles pour les moissonneurs distants sous Ensembles OAI. Les ensembles sont dfinis par des requtes de recherche (par exemple, authorName:king; ou parentId:1234 \u2014 pour slectionner tous les ensembles de donnes appartenant au dataverse spcifi; ou dsPersistentId:"doi:1234/" pour slectionner tous les ensembles de donnes avec l'identifiant perenne spcifi). Consultez la section sur l'API de recherche du guide d'utilisation de Dataverse pour plus d'informations sur les requtes de recherche.  
-harvestserver.noSets.getStarted=Pour commencer, activez le serveur OAI et cliquez sur le bouton \u00A0Ajouter un ensemble (set)\u00A0. Pour en apprendre plus sur le moissonnage, consultez la section  moissonnage du guide d''utilisation.
+harvestserver.noSets.how.tip2=Une fois le service activ, vous pouvez dfinir des collections d'ensembles de donnes locaux qui seront disponibles pour les moissonneurs distants sous Ensembles OAI. Les ensembles sont dfinis par des requtes de recherche (par exemple, authorName:king; ou parentId:1234 \u2014 pour slectionner tous les ensembles de donnes appartenant au dataverse spcifi; ou dsPersistentId:"doi:1234/" pour slectionner tous les ensembles de donnes avec l'identifiant perenne spcifi). Consulter la section sur l'API de recherche du guide d'utilisation de Dataverse pour plus d'informations sur les requtes de recherche.  
+harvestserver.noSets.getStarted=Pour commencer, activez le serveur OAI et cliquez sur le bouton \u00A0Ajouter un ensemble (set)\u00A0. Pour en apprendre plus sur le moissonnage, consulter la section  moissonnage du guide d''utilisation.
 harvestserver.btn.add=Ajouter un ensemble (set)
 harvestserver.tab.header.spec=setSpec OAI (identifiant OAI de l'ensemble)
+harvestserver.tab.col.spec.default=DFAUT
 harvestserver.tab.header.description=Description
 harvestserver.tab.header.definition=Dfinition de la requte
+harvestserver.tab.col.definition.default=Tous les ensembles de donnes locaux publis 
 harvestserver.tab.header.stats=Ensembles de donnes
 harvestserver.tab.col.stats.empty=Aucun enregistrement (ensemble vide)
-harvestserver.tab.col.stats.results={0} {0, choice, 0#Ensembles de donnes|1#Ensemble de donnes|2#Ensembles de donnes} ({1} {1, choice, 0#enregistrements|1#enregistrement|2#enregistrements} export(s), {2} marqu(s) comme supprim(s))
+harvestserver.tab.col.stats.results={0} {0, choice, 0#Ensemble de donnes|1#Ensemble de donnes|2#Ensembles de donnes} ({1} {1, choice, 0#enregistrement|1#enregistrement|2#enregistrements} export(s), {2} marqu(s) comme supprim(s))
 harvestserver.tab.header.action=Oprations
 harvestserver.tab.header.action.btn.export=Lancer l'exportation
 harvestserver.actions.runreexport.success=La tche asynchrone de rexportation de l''ensemble OAI \u00A0{0}\u00A0 a bien t lance (veuillez recharger la page pour suivre la progression de l''exportation).
@@ -505,6 +515,7 @@ harvestserver.newSetDialog.setspec=Nom/setSpec OAI
 harvestserver.newSetDialog.setspec.tip=Un nom unique (OAI setSpec) identifiant cet ensemble.
 harvestserver.newSetDialog.setspec.helptext=Se compose de lettres, de chiffres, de traits de soulignement (_) et de tirets (-).
 harvestserver.editSetDialog.setspec.helptext=Le nom ne peut pas tre modifi une fois l'ensemble cr.
+harvestserver.editSetDialog.setspec.helptext.default=Ceci est l'ensemble par dfaut, sans nom 
 harvestserver.newSetDialog.setspec.required=Le nom (setSpec OAI) ne peut tre vide!
 harvestserver.newSetDialog.setspec.invalid=Le nom (setSpec OAI) ne peut contenir que des lettres, des chiffres, des traits de soulignement (_) et des tirets (-).
 harvestserver.newSetDialog.setspec.alreadyused=Ce nom d'ensemble (setSpec OAI) est dj utilis.
@@ -514,6 +525,7 @@ harvestserver.newSetDialog.setspec.superUser.required=Seuls les super-utilisateu
 harvestserver.newSetDialog.setdescription=Description
 harvestserver.newSetDialog.setdescription.tip=Fournir une brve description de cet ensemble OAI.
 harvestserver.newSetDialog.setdescription.required=La description de l'ensemble ne peut tre vide!
+harvestserver.newSetDialog.setdescription.default=L'ensemble par dfaut, sans nom. Le serveur OAI retournera les enregistrements de cet ensemble lorsqu'aucun argument \u00A0setspec\u00A0 n'est spcifi par le client.
 harvestserver.newSetDialog.setquery=Requte de recherche
 harvestserver.newSetDialog.setquery.tip=Requte de recherche qui dfinit le contenu de l'ensemble de donnes.
 harvestserver.newSetDialog.setquery.helptext=Exemple de requte\u00A0: authorName:king
@@ -577,16 +589,16 @@ notification.email.revoke.role.subject={0}\u00A0: Votre r
 notification.email.verifyEmail.subject={0}\u00A0: Valider votre adresse courriel
 notification.email.greeting=Bonjour, \n
 # Bundle file editors, please note that "notification.email.welcome" is used in a unit test
-notification.email.welcome=Bienvenue dans {0}! Commencez ds maintenant en ajoutant ou encore en recherchant des donnes. Des questions? Consultez le guide d''utilisation ici {1}/{2}/user/ ou contactez le service de soutien {3} de {4} pour de l''aide.
+notification.email.welcome=Bienvenue dans {0}! Commencez ds maintenant en ajoutant ou encore en recherchant des donnes. Des questions? Consulter le guide d''utilisation ici {1}/{2}/user/ ou contactez le service de soutien {3} de {4} pour de l''aide.
 notification.email.welcomeConfirmEmailAddOn=\n\nVeuillez vrifier votre adresse courriel  {0}. Notez que le lien de validation expirera aprs {1}. Envoyez de nouveau un courriel de validation en vous rendant  la page de votre compte.
 notification.email.requestFileAccess=Accs au fichier demand pour l''ensemble de donnes\u00A0: {0}. Grer les autorisations  {1}.
 notification.email.grantFileAccess=Accs accord aux fichiers de l''ensemble de donnes\u00A0: {0} (voir {1}).
 notification.email.rejectFileAccess=Votre demande d''accs a t rejete pour les fichiers demands de l''ensemble de donnes\u00A0: {0} (voir {1}). Si vous avez des questions sur la raison pour laquelle votre demande a t rejete, vous pouvez contacter le propritaire de l''ensemble de donnes  l''aide du lien \u00A0Personne-ressource\u00A0 dans le coin suprieur droit de la page de l''ensemble de donnes.
 # Bundle file editors, please note that "notification.email.createDataverse" is used in a unit test
-notification.email.createDataverse=Votre nouveau dataverse intitul {0} (voir {1}) a t cr dans {2} (voir {3}). Pour en apprendre davantage sur ce que vous pouvez faire avec votre dataverse, consultez le guide d''utilisation Dataverse  l''adresse suivante\u00A0: {4}/{5}/user/dataverse-management.html .
+notification.email.createDataverse=Votre nouveau dataverse intitul {0} (voir {1}) a t cr dans {2} (voir {3}). Pour en apprendre davantage sur ce que vous pouvez faire avec votre dataverse, consulter le guide d''utilisation de Dataverse  l''adresse suivante\u00A0: {4}/{5}/user/dataverse-management.html .
 # Bundle file editors, please note that "notification.email.createDataset" is used in a unit test
-notification.email.createDataset=Votre nouvel ensemble de donnes intitul {0} (voir {1}) a t cr dans {2} (voir {3}). Pour en apprendre davantage sur ce que vous pouvez faire avec un ensemble de donnes, consultez le guide d''utilisation Dataverse sur la gestion d''un ensemble de donnes  l''adresse suivante\u00A0: {4}/{5}/user/dataset-management.html .
-notification.email.wasSubmittedForReview={0} (voir {1}) a t soumis aux fins d''examen en vue de sa publication dans {2}  (voir {3}). N''oubliez pas de le publier ou de le renvoyer au collaborateur\!
+notification.email.createDataset=Votre nouvel ensemble de donnes intitul {0} (voir {1}) a t cr dans {2} (voir {3}). Pour en apprendre davantage sur ce que vous pouvez faire avec un ensemble de donnes, consulter le guide d''utilisation de Dataverse sur la gestion d''un ensemble de donnes  l''adresse suivante\u00A0: {4}/{5}/user/dataset-management.html .
+notification.email.wasSubmittedForReview={0} (voir {1}) a t soumis aux fins d''examen en vue de sa publication dans {2}  (voir {3}). N''oubliez pas de le publier ou de le retourner au collaborateur ({4}  {5})\!
 notification.email.wasReturnedByReviewer={0} (voir {1}) a t retourn par l''intendant des donnes de {2} (voir {3}).
 notification.email.wasPublished={0} (voir {1}) a t publi dans {2} (voir {3}).
 notification.email.worldMap.added=Les donnes d''une couche WorldMap ont t ajoutes  {0} (voir {1}).
@@ -594,6 +606,8 @@ notification.email.closing=\n\nVous pouvez nous contacter pour du soutien 
 notification.email.assignRole=Vous tes maintenant {0} pour\u00A0: {1} \u00A0{2}\u00A0 (voir {3}).
 notification.email.revokeRole=Un de vos rles pour {0} \u00A0{1}\u00A0 a t rvoqu (voir {2}).
 notification.email.changeEmail=Bonjour, {0}.{1}\n\nVeuillez nous contacter si vous n''aviez pas l''intention de faire cette modification ou si vous avez besoin d''aide.
+notification.email.passwordReset=Bonjour {0},\n\nUn utilisateur, en l''occurrence vous, a demand une rinitialisation du mot de passe pour {1}.\n\nVeuillez cliquer sur le lien ci-dessous pour rinitialiser le mot de passe de votre compte Dataverse:\n\n{2}\n\nLe lien ci-dessus ne fonctionnera que pendant les {3} prochaines minutes.\n\nVeuillez nous contacter si vous n''avez pas demand la rinitialisation de ce mot de passe ou si vous avez besoin d''aide additionnelle.
+notification.email.passwordReset.subject=Rinitialisation du mot de passe de Dataverse demande
 hours=heures
 hour=heure
 minutes=minutes
@@ -602,6 +616,7 @@ notification.email.checksumfail.subject={0}\u00A0: votre validation de somme de
 notification.email.import.filesystem.subject=L''ensemble de donnes {0} a bien t tlcharg et vrifi
 notification.email.import.checksum.subject={0}\u00A0: Votre tche de somme de contrle de fichier est complte
 contact.delegation={0} au nom de {1}
+notification.email.info.unavailable=Non disponible
 
 # passwordreset.xhtml
 pageTitle.passwdReset.pre=Rinitialisation du mot de passe du compte
@@ -657,14 +672,14 @@ dataverse.field.set.tip=[+] Voir les champs et d
 dataverse.field.set.view=[+] Voir les champs
 dataverse.field.requiredByDataverse=Requis par Dataverse
 dataverse.facetPickList.text=Parcourir/Rechercher par facettes
-dataverse.facetPickList.tip=Choisir les champs de mtadonnes  utiliser comme facettes pour consulter les ensembles de donnes ainsi que les dataverses contenus dans ce dataverse.
+dataverse.facetPickList.tip=Choisir les champs de mtadonnes  utiliser comme facettes pour parcourir les ensembles de donnes et dataverses de ce dataverse.
 dataverse.facetPickList.facetsFromHost.text=Utiliser la fonction Parcourir/Recherche par facettes de {0}
 dataverse.facetPickList.metadataBlockList.all=Tous les champs de mtadonnes
 dataverse.edit=Modifier
 dataverse.option.generalInfo=Renseignements gnraux
 dataverse.option.themeAndWidgets=Thme + widgets
 dataverse.option.featuredDataverse=Dataverses en vedette
-dataverse.option.permissions=Permissions
+dataverse.option.permissions=Autorisations
 dataverse.option.dataverseGroups=Groupes
 dataverse.option.datasetTemplates=Modles d'ensembles de donnes
 dataverse.option.datasetGuestbooks=Registre des visiteurs de l'ensemble de donnes
@@ -677,11 +692,16 @@ dataverse.contact=Communiquer par courriel avec Dataverse
 dataset.link=Lier l'ensemble de donnes
 dataverse.link=Lier le dataverse
 dataverse.link.btn.tip=Lier  votre dataverse
-dataverse.link.yourDataverses={0, choice, 1#Votre dataverse|2#Vos dataverses}
+dataverse.link.yourDataverses=Votre dataverse
+dataverse.link.yourDataverses.inputPlaceholder=Entrer le nom du dataverse
 dataverse.link.save=Enregistrer la liaison du dataverse
 dataset.link.save=Enregistrer la liaison de l'ensemble de donnes
+dataset.link.not.to.owner=Impossible de lier un ensemble de donnes  son dataverse
+dataset.link.not.to.parent.dataverse=Impossible de lier un ensemble de donnes  ses dataverses parents
+dataset.link.not.published=Impossible de lier un ensemble de donnes qui n'a pas t publi
 dataverse.link.dataverse.choose=Dterminer avec lequel de vos dataverses vous souhaitez lier ce dataverse.
-dataverse.link.dataset.choose=Dterminer avec lequel de vos dataverses vous souhaitez lier cet ensemble de donnes.
+dataverse.link.dataset.choose=Dterminer avec lequel de vos dataverses vous souhaitez lier cet ensemble de donnes. Si vous devez supprimer ce lien  l''avenir, veuillez contacter {0}.
+dataverse.link.dataset.none=Il n'y a pas de dataverses disponibles pour crer une liaison.
 dataverse.link.no.choice=Vous avez un dataverse dans lequel vous pouvez ajouter des ensembles de donnes et des dataverses lis. 
 dataverse.link.no.linkable=Vous devez possder votre propre dataverse pour pouvoir lier un dataverse ou un ensemble de donnes. Cliquer sur le bouton \u00A0Ajouter des donnes\u00A0  la page d'accueil pour commencer.
 dataverse.link.no.linkable.remaining=Vous avez dj li tous vos dataverses admissibles.
@@ -712,12 +732,12 @@ dataverse.delete=Supprimer le dataverse
 dataverse.delete.success=Votre dataverse a t supprim.
 dataverse.delete.failure=Ce dataverse n'a pas pu tre supprim. 
 # Bundle file editors, please note that "dataverse.create.success" is used in a unit test because it's so fancy with two parameters
-dataverse.create.success=Vous avez bien russi  crer votre dataverse! Pour en apprendre davantage sur ce que vous pouvez faire avec votre dataverse, consultez le guide d''utilisation.
+dataverse.create.success=Vous avez bien russi  crer votre dataverse! Pour en apprendre davantage sur ce que vous pouvez faire avec votre dataverse, consulter le guide d''utilisation.
 dataverse.create.failure=Ce dataverse n'a pas pu tre cr. 
 dataverse.create.authenticatedUsersOnly=Seuls les utilisateurs authentifis peuvent crer des dataverses.
 dataverse.update.success=Vous avez bien mis  jour votre dataverse!
 dataverse.update.failure=Ce dataverse n'a pas pu tre mis  jour.
-dataverse.selected=Slectionn
+dataverse.selected=Slectionn(s)
 
 # rolesAndPermissionsFragment.xhtml
 
@@ -766,12 +786,12 @@ dataverse.results.empty.browse.guest.zero=Ce dataverse ne contient actuellement
 dataverse.results.empty.browse.guest.hidden=Ce dataverse ne contient aucun dataverse. Veuillez vous authentifier pour voir si vous pouvez y ajouter du contenu. 
 dataverse.results.empty.browse.loggedin.noperms.zero=Ce dataverse ne contient actuellement aucun dataverse, ensemble de donnes ou fichier. Vous pouvez utiliser le bouton \u00A0Envoyer un courriel  la personne-ressource du dataverse\u00A0 ci-dessus pour toute question sur ce dataverse ou pour effectuer une demande d'accs  ce dataverse.
 dataverse.results.empty.browse.loggedin.noperms.hidden=Il n'y a aucun dataverse dans ce dataverse.
-dataverse.results.empty.browse.loggedin.perms.zero=Ce dataverse ne contient actuellement aucun dataverse, ensemble de donnes ou fichier. Vous pouvez en ajouter  l'aide du bouton \u00A0Ajouter des donnes\u00A0 se trouvant sur cette page.
-account.results.empty.browse.loggedin.perms.zero=Il n''y a aucun dataverse, ensemble de donnes ou fichier associ  votre compte. Vous pouvez ajouter un dataverse ou un ensemble de donnes en cliquant sur le bouton \u00A0Ajouter des donnes\u00A0 ci-dessus. Pour en apprendre davantage sur l''ajout de donnes, consultez le guide d''utilisation.
+dataverse.results.empty.browse.loggedin.perms.zero=Ce dataverse ne contient actuellement aucun dataverse, ensemble de donnes ou fichier. Vous pouvez en ajouter  l''aide du bouton \u00A0Ajouter des donnes\u00A0 se trouvant sur cette page.
+account.results.empty.browse.loggedin.perms.zero=Il n''y a aucun dataverse, ensemble de donnes ou fichier associ  votre compte. Vous pouvez ajouter un dataverse ou un ensemble de donnes en cliquant sur le bouton \u00A0Ajouter des donnes\u00A0 ci-dessus. Pour en apprendre davantage sur l''ajout de donnes, consulter le guide d''utilisation.
 dataverse.results.empty.browse.loggedin.perms.hidden=Il n'y a aucun dataverse dans ce dataverse. Vous pouvez en ajouter  l'aide du bouton \u00A0Ajouter des donnes\u00A0 qui se trouve sur cette page.
 dataverse.results.empty.link.technicalDetails=Plus de dtails techniques
 dataverse.search.facet.error=Une erreur s''est produite avec vos paramtres de recherche. Veuillez supprimer votre recherche et essayer de nouveau.
-dataverse.results.count.toofresults={0}  {1} de {2} {2, choice, 0#rsultats|1#rsultat|2#rsultats}
+dataverse.results.count.toofresults={0}  {1} de {2} {2, choice, 0#rsultat|1#rsultat|2#rsultats}
 dataverse.results.paginator.current=(Actuel)
 dataverse.results.btn.sort=Tri
 dataverse.results.btn.sort.option.nameAZ=Nom (A-Z)
@@ -787,7 +807,7 @@ dataverse.theme.inheritCustomization.title=Utilisez le m
 dataverse.theme.inheritCustomization.label=Thme hrit
 dataverse.theme.inheritCustomization.checkbox=Hriter du thme de {0}
 dataverse.theme.logo=Logo
-dataverse.theme.logo.tip=Les formats d'image pris en charge sont JPG, TIF ou PNG et les fichiers ne doivent pas dpasser 500 Ko. La taille d'affichage maximale d'un fichier image dans le thme d'un dataverse est de 940 pixels de large par 120 pixels de hauteur.
+dataverse.theme.logo.tip=Les formats d'image pris en charge sont JPG, TIF ou PNG. Les fichiers ne doivent pas dpasser 500 Ko. La taille d'affichage maximale d'un fichier image dans le thme d'un dataverse est de 940 pixels de large par 120 pixels de hauteur.
 dataverse.theme.logo.format=Format du logo
 dataverse.theme.logo.format.selectTab.square=Carr
 dataverse.theme.logo.format.selectTab.rectangle=Rectangle
@@ -837,8 +857,8 @@ dataverse.widgets.notPublished.how.header=Comment utiliser les widgets
 dataverse.widgets.notPublished.how.tip1=Pour pouvoir utiliser des widgets, votre dataverse et vos ensembles de donnes doivent tre publis.
 dataverse.widgets.notPublished.how.tip2=Suite  la publication, le code sera disponible sur cette page pour que vous puissiez le copier et l'ajouter  votre site web personnel ou de projet.
 dataverse.widgets.notPublished.how.tip3=Avez-vous un site web OpenScholar? Si oui, apprenez-en davantage sur l''ajout de widgets Dataverse dans votre site web ici.
-dataverse.widgets.notPublished.getStarted=Pour dbuter, publiez votre dataverse. Pour en apprendre davantage sur les widgets, consultez la section thme et widgets du guide d''utilisation.
-dataverse.widgets.tip=Copiez et collez ce code dans le code HTML de votre site web. Pour apprendre davantage sur les widgets, consultez la section Thme et widgets du guide d''utilisation.
+dataverse.widgets.notPublished.getStarted=Pour dbuter, publiez votre dataverse. Pour en apprendre davantage sur les widgets, consulter la section thme et widgets du guide d''utilisation.
+dataverse.widgets.tip=Copier et coller ce code dans le code HTML de votre site web. Pour apprendre davantage sur les widgets, consulter la section Thme et widgets du guide d''utilisation.
 dataverse.widgets.searchBox.txt=Bote de recherche Dataverse
 dataverse.widgets.searchBox.tip=Permet aux visiteurs de votre site Web d'effectuer une recherche dans Dataverse.
 dataverse.widgets.dataverseListing.txt=Liste des dataverses
@@ -847,13 +867,13 @@ dataverse.widgets.advanced.popup.header=Widgets\u00A0: Options avanc
 dataverse.widgets.advanced.prompt=Expdier vers votre site web personnel l'URL prenne de la rfrence bibliographique de l'ensemble de donnes. La page que vous rferrez comme tant l'URL de votre site web personnel doit contenir l'extrait de code utilis par le widget Listing de Dataverse.
 dataverse.widgets.advanced.url.label=URL de votre site web personnel
 dataverse.widgets.advanced.url.watermark=http://www.exemple.com/nom-de-la-page
-dataverse.widgets.advanced.invalid.message=Veuillez saisir un URL valide
+dataverse.widgets.advanced.invalid.message=Veuillez saisir une URL valide
 dataverse.widgets.advanced.success.message=Mise  jour russie de l'URL de votre site web personnel
 dataverse.widgets.advanced.failure.message=L'URL du site web personnel associ  ce dataverse n'a pas t mis  jour.
 
 # permissions-manage.xhtml
-dataverse.permissions.title=Permissions
-dataverse.permissions.dataset.title=Permissions pour l'ensemble de donnes
+dataverse.permissions.title=Autorisations
+dataverse.permissions.dataset.title=Autorisations sur l'ensemble de donnes
 dataverse.permissions.access.accessBtn=Modifier l'accs
 dataverse.permissions.usersOrGroups=Utilisateurs/Groupes
 dataverse.permissions.requests=Requtes
@@ -874,7 +894,7 @@ dataverse.permissions.roles.edit=Modifier le r
 dataverse.permissions.roles.copy=Copier le rle
 
 # permissions-manage-files.xhtml
-dataverse.permissionsFiles.title=Permissions des fichiers  accs rserv
+dataverse.permissionsFiles.title=Autorisations sur les fichiers  accs rserv
 dataverse.permissionsFiles.usersOrGroups=Utilisateurs/Groupes
 dataverse.permissionsFiles.usersOrGroups.assignBtn=Accorder l'accs aux utilisateurs/groupes
 dataverse.permissionsFiles.usersOrGroups.description=Tous les utilisateurs et les groupes qui ont accs aux fichiers  accs rserv de cet ensemble de donnes.
@@ -887,7 +907,7 @@ dataverse.permissionsFiles.usersOrGroups.file=Fichier
 dataverse.permissionsFiles.usersOrGroups.files=Fichiers
 dataverse.permissionsFiles.usersOrGroups.invalidMsg=Aucun utilisateur ou groupe n'a accs aux fichiers rservs de cet ensemble de donnes.
 dataverse.permissionsFiles.files=Fichiers  accs rserv
-dataverse.permissionsFiles.files.label={0, choice, 0#Fichiers  accs rserv|1#Fichier  accs rserv|2#Fichiers  accs rserv}
+dataverse.permissionsFiles.files.label={0, choice, 0#Fichier  accs rserv|1#Fichier  accs rserv|2#Fichiers  accs rserv}
 dataverse.permissionsFiles.files.description=Tous les fichiers en accs rserv dans cet ensemble de donnes.
 dataverse.permissionsFiles.files.tabHeader.fileName=Nom du fichier
 dataverse.permissionsFiles.files.tabHeader.roleAssignees=Utilisateurs/Groupes
@@ -899,7 +919,7 @@ dataverse.permissionsFiles.files.public=Public
 dataverse.permissionsFiles.files.restricted=Accs rserv
 dataverse.permissionsFiles.files.roleAssignee=Utilisateur/Groupe
 dataverse.permissionsFiles.files.roleAssignees=Utilisateurs/Groupes
-dataverse.permissionsFiles.files.roleAssignees.label={0, choice, 0#Utilisateurs/Groupes|1#Utilisateur/Groupe|2#Utilisateurs/Groupes}
+dataverse.permissionsFiles.files.roleAssignees.label={0, choice, 0#Utilisateur/Groupe|1#Utilisateur/Groupe|2#Utilisateurs/Groupes}
 dataverse.permissionsFiles.files.assignBtn=Accorder l'accs
 dataverse.permissionsFiles.files.invalidMsg=Cet ensemble de donnes ne contient aucun fichier en accs rserv.
 dataverse.permissionsFiles.files.requested=Fichiers demands
@@ -920,27 +940,27 @@ dataverse.permissionsFiles.assignDialog.rejectBtn=Rejeter
 # permissions-configure.xhtml
 dataverse.permissions.accessDialog.header=Modifier l'accs
 dataverse.permissions.description=Configuration actuelle de l'accs  votre dataverse.
-dataverse.permissions.tip=Slectionnez, en cliquant sur le bouton \u00A0Modifier l'accs\u00A0, si tous les utilisateurs ou seulement certains sont en mesure d'ajouter des donnes  ce dataverse. 
+dataverse.permissions.tip=Slectionner, en cliquant sur le bouton \u00A0Modifier l'accs\u00A0, si tous les utilisateurs ou seulement certains d'entre eux sont en mesure d'ajouter des donnes  ce dataverse. 
 dataverse.permissions.Q1=Qui peut ajouter des donnes  ce dataverse?
 dataverse.permissions.Q1.answer1=Toute personne qui ajoute des donnes  ce dataverse doit y avoir accs.
 dataverse.permissions.Q1.answer2=Toute personne possdant un compte Dataverse peut ajouter des sous-dataverses.
 dataverse.permissions.Q1.answer3=Toute personne possdant un compte Dataverse peut ajouter des ensembles de donnes.
 dataverse.permissions.Q1.answer4=Toute personne possdant un compte Dataverse peut ajouter des sous-dataverses et des ensembles de donnes.
 dataverse.permissions.Q2=Lorsqu'un utilisateur ajoute un nouvel ensemble de donnes  ce dataverse, quel rle doit-il lui tre attribu automatiquement sur cet ensemble de donnes?
-dataverse.permissions.Q2.answer.editor.description=\u2014 Modifier les mtadonnes, tlverser les fichiers et modifier les fichiers, modifier les conditions, le registre des visiteurs, soumettre les ensembles de donnes aux fins d'examen.
-dataverse.permissions.Q2.answer.manager.description=\u2014 Modifier les mtadonnes, tlverser les fichiers et modifier les fichiers, modifier les conditions, le registre des visiteurs, les restrictions relatives aux fichiers (accs aux fichiers + utilisation)
-dataverse.permissions.Q2.answer.curator.description=\u2014 Modifier les mtadonnes, tlverser les fichiers et modifier les fichiers, modifier les conditions, le registre des visiteurs, les restrictions relatives aux fichiers (accs aux fichiers + utilisation), modifier les permissions/assigner les rles + publier
+dataverse.permissions.Q2.answer.editor.description=\u2014 Modifier les mtadonnes, tlverser les fichiers, modifier les fichiers, modifier les conditions, le registre des visiteurs, soumettre les ensembles de donnes aux fins d'examen.
+dataverse.permissions.Q2.answer.manager.description=\u2014 Modifier les mtadonnes, tlverser les fichiers, modifier les fichiers, modifier les conditions, le registre des visiteurs, les restrictions relatives aux fichiers (accs aux fichiers + utilisation)
+dataverse.permissions.Q2.answer.curator.description=\u2014 Modifier les mtadonnes, tlverser les fichiers, modifier les fichiers, modifier les conditions, le registre des visiteurs, les restrictions relatives aux fichiers (accs aux fichiers + utilisation), modifier les autorisations/assigner les rles + publier
 permission.anyoneWithAccount=Toute personne possdant un compte Dataverse
 
 # roles-assign.xhtml
 dataverse.permissions.usersOrGroups.assignDialog.header=Assigner le rle
-dataverse.permissions.usersOrGroups.assignDialog.description=Accorder les permissions aux utilisateurs et aux groupes en leur attribuant un rle.
+dataverse.permissions.usersOrGroups.assignDialog.description=Accorder des autorisations aux utilisateurs et aux groupes en leur attribuant un rle.
 dataverse.permissions.usersOrGroups.assignDialog.userOrGroup=Utilisateurs/groupes
 dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.enterName=Indiquer le nom de l'utilisateur ou du groupe.
 dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.invalidMsg=Aucun rsultat
 dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.requiredMsg=Veuillez slectionner au moins un utilisateur ou un groupe.
-dataverse.permissions.usersOrGroups.assignDialog.role.description=Voici les permissions associes au rle slectionn.
-dataverse.permissions.usersOrGroups.assignDialog.role.warning=L''attribution du rle {0} signifie que le ou les utilisateurs auront galement le rle {0} qui s''applique  tous les {1} dans ce {2}.
+dataverse.permissions.usersOrGroups.assignDialog.role.description=Voici les autorisations associes au rle slectionn.
+dataverse.permissions.usersOrGroups.assignDialog.role.warning=L''attribution du rle {0} signifie que le ou les utilisateurs auront galement le rle {0} qui s''applique  tous les {1} dans ce(t) {2}.
 dataverse.permissions.usersOrGroups.assignDialog.role.requiredMsg=Veuillez slectionner un rle  attribuer.
 
 # roles-edit.xhtml
@@ -951,8 +971,8 @@ dataverse.permissions.roles.id=Identifiant
 dataverse.permissions.roles.id.title=Indiquer un nom pour l'alias.
 dataverse.permissions.roles.description.title=Dcrire le rle (1000 caractres maximum).
 dataverse.permissions.roles.description.counter={0} caractre(s) restant(s)
-dataverse.permissions.roles.roleList.header=Permissions du rle
-dataverse.permissions.roles.roleList.authorizedUserOnly=Les permissions comportant l'icne Information indiquent que les actions peuvent tre faites par des utilisateurs non authentifis dans Dataverse.
+dataverse.permissions.roles.roleList.header=Autorisations du rle
+dataverse.permissions.roles.roleList.authorizedUserOnly=Les autorisations comportant l'icne Information indiquent que les actions peuvent tre faites par des utilisateurs non authentifis dans Dataverse.
 
 # explicitGroup-new-dialog.xhtml
 dataverse.permissions.explicitGroupEditDialog.title.new=Crer un groupe
@@ -982,7 +1002,7 @@ dataset.manageTemplates.noTemplates.why.reason2=Les mod
 dataset.manageTemplates.noTemplates.how.header=Comment utiliser les modles
 dataset.manageTemplates.noTemplates.how.tip1=Les modles sont crs au niveau du dataverse, peuvent tre supprims (si on ne veut pas qu'ils paraissent dans les futurs ensembles de donnes), sont activs par dfaut (non requis) et peuvent tre copis de faon  ce que vous n'ayez pas  recommencer du dbut lorsque vous crez un nouveau modle contenant des mtadonnes similaires  un autre modle. Lorsqu'un modle est supprim, il n'y a aucune incidence sur les ensembles de donnes qui ont dj utilis le modle.
 dataset.manageTemplates.noTemplates.how.tip2=Veuillez noter que la possibilit de choisir les champs de mtadonnes qui seront cachs, obligatoires ou facultatifs est disponible sur la page Renseignements gnraux de ce dataverse.
-dataset.manageTemplates.noTemplates.getStarted=Pour commencer, cliquez sur le bouton \u00A0Crer un modle d''ensemble de donnes\u00A0 ci-dessus. Pour en apprendre davantage au sujet des modles, consultez la section modles d''ensemble de donnesdu guide d''utilisation.
+dataset.manageTemplates.noTemplates.getStarted=Pour commencer, cliquez sur le bouton \u00A0Crer un modle d''ensemble de donnes\u00A0 ci-dessus. Pour en apprendre davantage au sujet des modles, consulter la section modles d''ensemble de donnes du guide d''utilisation.
 dataset.manageTemplates.tab.header.templte=Nom du modle
 dataset.manageTemplates.tab.header.date=Date de cration
 dataset.manageTemplates.tab.header.usage=Usage
@@ -1019,11 +1039,11 @@ dataset.create.add.terms=Sauvegarder et ajouter des conditions d'utilisation
 dataverse.manageGroups.pageTitle=Grer des groupes Dataverse
 dataverse.manageGroups.createBtn=Crer un groupe
 dataverse.manageGroups.noGroups.why.header=Pourquoi faire appel aux groupes?
-dataverse.manageGroups.noGroups.why.reason1=Les groupes vous permettent d'attribuer des rles et permissions  plusieurs personnes  la fois. 
+dataverse.manageGroups.noGroups.why.reason1=Les groupes vous permettent d'attribuer des rles et autorisations  plusieurs personnes  la fois. 
 dataverse.manageGroups.noGroups.why.reason2=Vous pouvez faire appel aux groupes pour la gestion de diffrents types d'utilisateurs (tudiants, collaborateurs, etc.).
 dataverse.manageGroups.noGroups.how.header=Comment utiliser les groupes
 dataverse.manageGroups.noGroups.how.tip1=Un groupe peut comprendre  la fois des individus et d'autres groupes. 
-dataverse.manageGroups.noGroups.how.tip2=Vous pouvez attribuer des permissions  un groupe dans le volet \u00A0Permissions\u00A0. 
+dataverse.manageGroups.noGroups.how.tip2=Vous pouvez attribuer des autorisations  un groupe dans le volet \u00A0Autorisations\u00A0. 
 dataverse.manageGroups.noGroups.getStarted=Pour dbuter, cliquez sur le bouton \u00A0Crer un groupe\u00A0 ci-dessus.
 dataverse.manageGroups.tab.header.name=Nom du groupe 
 dataverse.manageGroups.tab.header.id=Identifiant du groupe
@@ -1051,7 +1071,7 @@ dataverse.manageGroups.tab.action.btn.view.dialog.invalidMsg=Aucun r
 # manage-guestbooks.xhtml
 dataset.manageGuestbooks.pageTitle=Grer les registres de visiteurs pour les ensembles de donnes
 dataset.manageGuestbooks.include=Comprend les registres de visiteurs de {0}.
-dataset.manageGuestbooks.createBtn=Crer un registre des visiteurs pour l'ensemble de donnes
+dataset.manageGuestbooks.createBtn=Crer un registre des visiteurs pour les ensembles de donnes
 dataset.manageGuestbooks.download.all.responses=Tlcharger toutes les entres
 dataset.manageGuestbooks.download.responses=Tlcharger les entres
 dataset.manageGuestbooks.noGuestbooks.why.header=Pourquoi utiliser des registres de visiteurs?
@@ -1059,8 +1079,8 @@ dataset.manageGuestbooks.noGuestbooks.why.reason1=Les registres de visiteurs vou
 dataset.manageGuestbooks.noGuestbooks.why.reason2=Vous pouvez tlcharger les donnes recueillies dans les registres de visiteurs activs afin de pouvoir les enregistrer en dehors de Dataverse.
 dataset.manageGuestbooks.noGuestbooks.how.header=Comment utiliser les registres de visiteurs
 dataset.manageGuestbooks.noGuestbooks.how.tip1=Un registre des visiteurs peut tre utilis pour plusieurs ensembles de donnes, mais un seul registre des visiteurs peut tre utilis pour un ensemble de donnes.
-dataset.manageGuestbooks.noGuestbooks.how.tip2=Les questions personnalises peuvent comprendre des rponses en texte libre ou des questions  choice de rponses.
-dataset.manageGuestbooks.noGuestbooks.getStarted=Pour commencer, cliquez ci-dessus sur le bouton \u00A0Crer un registre des visiteurs pour l''ensemble de donnes\u00A0. Pour en apprendre davantage sur les registres de visiteurs, visitez la section registre des visiteurs du guide d''utilisation.
+dataset.manageGuestbooks.noGuestbooks.how.tip2=Les questions personnalises peuvent comprendre des rponses en texte libre ou des questions  choix de rponses.
+dataset.manageGuestbooks.noGuestbooks.getStarted=Pour dbuter, cliquez ci-dessus sur le bouton \u00A0Crer un registre des visiteurs pour les ensembles de donnes\u00A0. Pour en apprendre davantage sur les registres de visiteurs, visiter la section registre des visiteurs du guide d''utilisation.
 dataset.manageGuestbooks.tab.header.name=Nom du registre des visiteurs
 dataset.manageGuestbooks.tab.header.date=Date de cration
 dataset.manageGuestbooks.tab.header.usage=Usage
@@ -1097,9 +1117,11 @@ dataset.guestbooksResponses.dataset=Ensemble de donn
 dataset.guestbooksResponses.date=Date
 dataset.guestbooksResponses.type=Type
 dataset.guestbooksResponses.file=Fichier
+dataset.guestbooksResponses.customQuestions=Questions personnalises
+dataset.guestbooksResponses.user=Utilisateur
 dataset.guestbooksResponses.tip.title=Entres du registre de visiteur
-dataset.guestbooksResponses.count.responses={0} {0, choice, 0#Entres|1#Entre|2#Entres}
-dataset.guestbooksResponses.count.toofresults={0}  {1} de {2} {2, choice, 0#Entres|1#Entre|2#Entres}
+dataset.guestbooksResponses.count.responses={0} {0, choice, 0#Entre|1#Entre|2#Entres}
+dataset.guestbooksResponses.count.toofresults={0}  {1} de {2} {2, choice, 0#Entre|1#Entre|2#Entres}
 dataset.guestbooksResponses.tip.downloadascsv=Cliquer sur \u00A0Tlcharger les entres\u00A0 pour tlcharger dans un fichier CSV les entres recueillies dans le registre de visiteurs de ce dataverse. Pour naviguer et analyser les donnes ainsi collectes, nous vous recommandons d'importer ce fichier CSV dans Excel, Google Sheets ou un logiciel similaire.
 dataset.guestbooksResponses.tooManyResponses.message=Note\u00A0: ce registre de visiteurs contient trop d''entres pour qu''elles puissent tre affiches entirement sur cette page. Seules les {0} entres les plus rcentes sont affiches ci-dessous. Cliquez sur \u00A0Tlcharger les entres\u00A0 pour tlcharger toutes les entres recueillies ({1} au total) sous forme de fichier CSV.
 
@@ -1133,9 +1155,9 @@ dataset.editBtn=Modifier
 dataset.editBtn.itemLabel.upload=Fichiers (tlverser)
 dataset.editBtn.itemLabel.metadata=Mtadonnes
 dataset.editBtn.itemLabel.terms=Conditions d'utilisation
-dataset.editBtn.itemLabel.permissions=Permissions
+dataset.editBtn.itemLabel.permissions=Autorisations
 dataset.editBtn.itemLabel.thumbnailsAndWidgets=Vignettes + Widgets
-dataset.editBtn.itemLabel.privateUrl=URL priv
+dataset.editBtn.itemLabel.privateUrl=URL prive
 dataset.editBtn.itemLabel.permissionsDataset=Ensemble de donnes
 dataset.editBtn.itemLabel.permissionsFile=Fichiers  accs rserv
 dataset.editBtn.itemLabel.deleteDataset=Supprimer l'ensemble de donnes
@@ -1145,12 +1167,14 @@ dataset.exportBtn=Exporter les m
 dataset.exportBtn.itemLabel.ddi=DDI
 dataset.exportBtn.itemLabel.dublinCore=Dublin Core
 dataset.exportBtn.itemLabel.schemaDotOrg=Schema.org JSON-LD
+dataset.exportBtn.itemLabel.datacite=DataCite
 dataset.exportBtn.itemLabel.json=JSON
+dataset.exportBtn.itemLabel.oai_ore=OAI_ORE
 metrics.title=Statistiques
 metrics.title.tip=Afficher plus d'informations sur les statistiques d'utilisation
 metrics.comingsoon=Bientt disponible\u2026
 metrics.views=Pages consultes
-metrics.downloads={0, choice, 0#tlchargements|1#tlchargement|2#tlchargements}
+metrics.downloads={0, choice, 0#tlchargement|1#tlchargement|2#tlchargements}
 metrics.citations=Citations
 metrics.shares=Partages
 dataset.publish.btn=Publier
@@ -1190,7 +1214,7 @@ dataset.viewVersion.unpublished=Voir la version non publi
 dataset.viewVersion.published=Voir la version publie
 dataset.email.datasetContactBtn=Envoyer un courriel  la personne-ressource de l'ensemble de donnes
 dataset.email.hiddenMessage=
-dataset.email.messageSubject=Objet du message
+dataset.email.messageSubject=Test objet du message
 dataset.email.datasetLinkBtn.tip=Lier l'ensemble de donnes  votre dataverse
 dataset.share.datasetShare=Partager l'ensemble de donnes
 dataset.share.datasetShare.tip=Partager cet ensemble de donnes sur vos mdias sociaux prfrs.
@@ -1221,7 +1245,7 @@ dataset.versionUI.deaccessioned=Retir
 dataset.cite.title.released=La VERSION PROVISOIRE sera remplace dans la rfrence bibliographique par la V1 une fois l'ensemble de donnes publi.
 dataset.cite.title.draft=La VERSION PROVISOIRE sera remplace dans la rfrence bibliographique par la version slectionne une fois l'ensemble de donnes publi.
 dataset.cite.title.deassessioned=La mention VERSION RETIRE a t ajoute  la rfrence bibliographique pour cette version tant donn qu'elle n'est plus disponible.
-dataset.cite.standards.tip=Pour en apprendre davantage sur le sujet, consultez le document Data Citation Standards [en].
+dataset.cite.standards.tip=Pour en apprendre davantage sur le sujet, consulter le document Data Citation Standards [en].
 dataset.cite.downloadBtn=Citer l'ensemble de donnes
 dataset.cite.downloadBtn.xml=EndNote XML
 dataset.cite.downloadBtn.ris=RIS
@@ -1232,9 +1256,11 @@ dataset.beAccessedAt=L'ensemble de donn
 dataset.descriptionDisplay.title=Description
 dataset.keywordDisplay.title=Mot-cl
 dataset.subjectDisplay.title=Sujet
-dataset.contact.tip=Utiliser le bouton de courriel ci-dessus pour communiquer avec cette personne. 
+dataset.contact.tip=Utiliser le bouton de courriel ci-dessus pour joindre la personne-contact. 
 dataset.asterisk.tip=Les astrisques indiquent les champs obligatoires.
-dataset.message.uploadFiles=Tlverser les fichiers de l'ensemble de donnes \u2014 Vous pouvez glisser-dplacer les fichiers  partir de votre ordinateur vers le widget de tlversement. 
+dataset.message.uploadFiles.label=Tlverser les fichiers de l'ensemble de donnes. 
+dataset.message.uploadFilesSingle.message=Pour plus d''informations sur les formats de fichiers pris en charge, veuillez vous reporter au guide d''utilisation.
+dataset.message.uploadFilesMultiple.message=Plusieurs mthodes de tlversement/tlchargement de fichier sont disponibles pour cet ensemble de donnes. Une fois que vous avez tlvers un fichier en utilisant l'une de ces mthodes, votre choix sera verrouill pour cet ensemble de donnes.
 dataset.message.editMetadata=Modifier les mtadonnes de l'ensemble de donnes\u00A0: ajouter plus de mtadonnes afin de faciliter le reprage de cet ensemble.
 dataset.message.editTerms=Modifier les conditions de l'ensemble de donnes\u00A0: mettre  jour les conditions d'utilisation de cet ensemble de donnes.
 dataset.message.locked.editNotAllowedInReview=L'ensemble de donnes ne peut pas tre modifi en raison du verrouillage de l'ensemble de donnes en rvision.
@@ -1244,7 +1270,7 @@ dataset.message.locked.editNotAllowed=L'ensemble de donn
 dataset.message.createSuccess=Cet ensemble de donnes a t cr
 dataset.message.createSuccess.failedToSaveFiles=Succs partiel\u00A0: l'ensemble de donnes a t cr mais le(s) fichier(s) n'a(ont) pas pu tre sauvegard(s). Veuillez ressayer de tlverser le(s) fichier(s) de nouveau.
 dataset.message.createSuccess.partialSuccessSavingFiles=Succs partiel\u00A0: l''ensemble de donnes a t cr mais seul(s) {0} sur {1} fichier(s) a(ont) t enregistr(s). Veuillez ressayer de tlverser le(s) fichier(s) manquant(s) de nouveau.
-dataset.message.linkSuccess=Cet ensemble de donnes est maintenant li  {1}.
+dataset.message.linkSuccess={0} est maintenant li  {1}. Si vous devez supprimer ce lien  l''avenir, veuillez contacter {2}.
 dataset.message.metadataSuccess=Les mtadonnes de cet ensemble de donnes ont t mises  jour.
 dataset.message.termsSuccess=Les conditions de cet ensemble de donnes ont t mises  jour.
 dataset.message.filesSuccess=Les fichiers de cet ensemble de donnes ont t mis  jour.
@@ -1271,10 +1297,14 @@ dataset.message.termsFailure=Les conditions de cet ensemble de donn
 dataset.message.publicInstall=Accs aux fichiers \u2014 Les fichiers sont stocks sur un serveur de stockage accessible publiquement.
 dataset.metadata.publicationDate=Date de publication
 dataset.metadata.publicationDate.tip=La date de publication d'un ensemble de donnes.
+dataset.metadata.publicationYear=Anne de publication
+dataset.metadata.publicationYear.tip=L'anne de publication d'un ensemble de donnes.
 dataset.metadata.persistentId=Identifiant prenne de l'ensemble de donnes
 dataset.metadata.persistentId.tip=L'identifiant unique permanent pour un ensemble de donnes, lequel peut tre dans Dataverse un Handle ou un DOI.
+dataset.metadata.alternativePersistentId=Identifiant permanent prcdent de l'ensemble de donnes
+dataset.metadata.alternativePersistentId.tip=Un identifiant permanent prcdemment utilis pour un ensemble de donnes. Dans Dataverse cel peut tre un Handle ou un DOI.
 file.metadata.persistentId=Identifiant permanent du fichier
-file.metadata.persistentId.tip=L'identifiant unique permanent pour un fichier, lequel peut tre dans Dataverse un Handle ou un DOI.
+file.metadata.persistentId.tip=L'identifiant unique permanent pour un fichier, lequel peut tre, dans Dataverse, un Handle ou un DOI.
 dataset.versionDifferences.termsOfUseAccess=Conditions d'utilisation et d'accs
 dataset.versionDifferences.termsOfUseAccessChanged=Conditions d'utilisation et d'accs modifies
 file.viewDiffDialog.restricted=Accs rserv
@@ -1292,40 +1322,39 @@ dataset.noValidSelectedFilesForDownload=Le ou les fichiers r
 dataset.mixedSelectedFilesForDownload=Le ou les fichiers rservs slectionns ne peuvent tre tlchargs, car les accs ne vous ont pas t accords.
 dataset.downloadUnrestricted=Cliquez sur Continuer pour tlcharger les fichiers pour lesquels vous avez un accs.
 dataset.requestAccessToRestrictedFiles=Vous pouvez demander l'accs  un ou des fichiers rservs en cliquant sur le bouton \u00A0Demander l'accs\u00A0.
-dataset.privateurl.infoMessageAuthor=URL priv de l''ensemble de donnes non publi \u2014 Partager en priv cet ensemble de donnes avant sa publication\u00A0: {0}
-dataset.privateurl.infoMessageReviewer=URL priv de l'ensemble de donnes non publi \u2014 Cet ensemble de donnes non publi est partag en priv. Vous ne pourrez pas y accder lorsque connect  votre compte Dataverse.
+dataset.privateurl.infoMessageAuthor=URL prive de l''ensemble de donnes non publi \u2014 Partager en priv cet ensemble de donnes avant sa publication\u00A0: {0}
+dataset.privateurl.infoMessageReviewer=URL prive de l'ensemble de donnes non publi \u2014 Cet ensemble de donnes non publi est partag en priv. Vous ne pourrez pas y accder lorsque connect  votre compte Dataverse.
 dataset.privateurl.header=URL prive de l'ensemble de donnes non publi
-dataset.privateurl.tip=Utiliser une adresse URL prive pour permettre  ceux qui n''ont pas de compte Dataverse d''accder  votre ensemble de donnes non publi. Pour plus d''informations sur la fonctionnalit d''URL priv, reportez-vous au guide d''utilisation.
+dataset.privateurl.tip=Utiliser une adresse URL prive pour permettre  ceux qui n''ont pas de compte Dataverse d''accder  votre ensemble de donnes non publi. Pour plus d''informations sur la fonctionnalit d''URL prive, reportez-vous au guide d''utilisation.
 dataset.privateurl.absent=L'adresse URL prive n'a pas t cre.
 dataset.privateurl.createPrivateUrl=Crer une adresse URL prive
-dataset.privateurl.disablePrivateUrl=Dsactiver l'URL priv
-dataset.privateurl.disablePrivateUrlConfirm=Confirmer la dsactivation de l'URL priv
-dataset.privateurl.disableConfirmationText=Voulez-vous vraiment dsactiver l'URL priv? Si vous avez partag l'URL priv avec d'autres utilisateurs, ceux-ci ne pourront plus l'utiliser pour accder  votre ensemble de donnes non publi.
-dataset.privateurl.cannotCreate=L'URL priv ne peut tre utilis qu'avec des versions non publies d'ensembles de donnes.
-dataset.privateurl.roleassigeeTitle=URL priv activ
+dataset.privateurl.disablePrivateUrl=Dsactiver l'URL prive
+dataset.privateurl.disablePrivateUrlConfirm=Confirmer la dsactivation de l'URL prive
+dataset.privateurl.disableConfirmationText=Voulez-vous vraiment dsactiver l'URL prive? Si vous avez partag l'URL prive avec d'autres utilisateurs, ceux-ci ne pourront plus l'utiliser pour accder  votre ensemble de donnes non publi.
+dataset.privateurl.cannotCreate=L'URL prive ne peut tre utilise qu'avec des versions non publies d'ensembles de donnes.
+dataset.privateurl.roleassigeeTitle=URL prive active
 dataset.privateurl.createdSuccess=Opration russie!
-dataset.privateurl.disabledSuccess=Vous avez bien dsactiv l'URL priv de cet ensemble de donnes non publi.
-dataset.privateurl.noPermToCreate=Pour crer une adresse URL priv, vous devez disposer des autorisations suivantes\u00A0: {0}.
-
-
-file.count={0} {0, choice, 0#Fichiers|1#Fichiers|2#Fichiers}
-file.count.shown={0} {0, choice, 0#Fichiers slectionns|1#Fichier|2#Fichiers}
-
-
+dataset.privateurl.disabledSuccess=Vous avez bien dsactiv l'URL prive de cet ensemble de donnes non publi.
+dataset.privateurl.noPermToCreate=Pour crer une adresse URL prive, vous devez disposer des autorisations suivantes\u00A0: {0}.
+file.count.one=1 fichier
+file.count={0}  {1} de {2} {2, choice, 0#Fichier|1#Fichier|2#Fichiers}
+file.count.shown={0} {0, choice, 0#Fichier slectionn|1#Fichier|2#Fichiers}
 file.clearSelection=Effacer la slection.
-file.numFilesSelected={0} {0, choice, 0#fichiers sont|1#fichier est|2#fichiers sont} actuellement slectionn(s).
+file.numFilesSelected={0} {0, choice, 0#fichier est|1#fichier est|2#fichiers sont} actuellement slectionn(s).
 file.selectAllFiles=Slectionner tous les {0} fichiers de cet ensemble de donnes.
 file.dynamicCounter.filesPerPage=Fichiers par page
-
-
 file.selectToAddBtn=Slectionner les fichiers  ajouter
 file.selectToAdd.tipLimit=La limite de tlversement est de {0} par fichier.
-file.selectToAdd.tipMoreInformation=Pour plus d''informations sur les formats de fichiers pris en charge, reportez-vous au guide d''utilisation.
+file.selectToAdd.tipMoreInformation=Slectionner les fichiers ou les glisser-dposer vers le widget de tlversement.
 file.selectToAdd.dragdropMsg=Glisser et dposer les fichiers ici.
-file.createUploadDisabled=Une fois que vous avez sauvegard votre ensemble de donnes, vous pouvez tlverser vos donnes en utilisant le bouton \u00A0Tlverser des fichiers\u00A0 sur la page de l'ensemble de donnes. Pour plus d'informations sur les formats de fichiers pris en charge, reportez-vous au guide d'utilisation.
+file.createUploadDisabled=Tlverser des fichiers en utilisant Rsync via SSH. Cette mthode est recommande pour les transferts de fichiers volumineux. Le script de tlversement sera disponible sur la page Tlversement des fichiers une fois cet ensemble de donnes enregistr.
+file.fromHTTP=Tlverser avec HTTP via votre navigateur
 file.fromDropbox=Tlverser  partir de Dropbox
-file.fromDropbox.tip=Les fichiers peuvent aussi tre tlverser directement de Dropbox.
-file.replace.original=Original File
+file.fromDropbox.tip=Slectionner des fichiers  partir de Dropbox.
+file.fromRsync=Tlverser avec Rsync + SSH via le module de capture de donnes (Data Capture Module \u2014 DCM)
+file.api.httpDisabled=Le tlversement de fichiers via HTTP n'est pas disponible pour cette installation de Dataverse.
+file.api.alreadyHasPackageFile=Le tlversement de fichiers via HTTP est dsactiv car cet ensemble de donnes contient dj un fichier de paquetage.
+file.replace.original=Fichier original
 file.editFiles=Modifier les fichiers
 file.editFilesSelected=Modifier
 file.editFile=Modifier
@@ -1360,19 +1389,24 @@ file.selectedThumbnail=Vignette
 file.selectedThumbnail.tip=La vignette associe au fichier est utilise comme vignette par dfaut pour l'ensemble de donnes. Cliquez sur le bouton \u00A0Options avances\u00A0 d'un autre fichier pour slectionner ce fichier.
 file.cloudStorageAccess=Accs au stockage infonuagique
 file.cloudStorageAccess.tip=Le nom du conteneur pour cet ensemble de donnes doit accder aux fichiers dans le stockage infonuagique.
-file.cloudStorageAccess.help=Pour accder directement  ces donnes dans l''environnement infonuagique {2}, utilisez le nom du conteneur dans la case d''accs au stockage infonuagique ci-dessous. Pour en apprendre davantage sur l''environnement infonuagique, consultez la section accs au stockage infonuagique du guide d''utilisation.
+file.cloudStorageAccess.help=Pour accder directement  ces donnes dans l''environnement infonuagique {2}, utiliser le nom du conteneur dans la case d''accs au stockage infonuagique ci-dessous. Pour en apprendre davantage sur l''environnement infonuagique, consulter la section accs au stockage infonuagique du guide d''utilisation.
 file.copy=Copier
 file.compute=Calculer
-file.rsyncUpload.info=Veuillez suivre ces tapes pour tlverser vos donnes. Pour en apprendre davantage sur le processus de tlversement et sur comment prparer vos donnes, veuillez vous reporter  la section Manipulation et tlchargement de fichiers du guide d''utilisation.
-file.rsyncUpload.noScriptAvailable=Le script Rsync n'est pas disponible!
-file.rsyncUpload.filesExist=Vous ne pouvez pas tlverser des fichiers supplmentaires dans cet ensemble de donnes.
+file.rsyncUpload.info=Tlverser des fichiers en utilisant Rsync + SSH. Cette mthode est recommande pour les transferts de fichiers volumineux. Suivre les tapes ci-dessous pour tlverser vos donnes. (Tlversement Rsync \u2014 guide d''utilisation).
+file.rsyncUpload.filesExist=Vous ne pouvez pas tlverser de fichiers supplmentaires dans cet ensemble de donnes. Un ensemble de donnes ne peut contenir qu''un seul paquet de donnes. Si vous devez remplacer le paquet de donnes dans cet ensemble de donnes, veuillez contacter {0}.
+file.rsyncUpload.noScriptBroken=Le module de capture de donnes (DCM) n''a pas russi  gnrer le script Rsync. Veuillez contacter {0}.
+file.rsyncUpload.noScriptBusy=Le systme gnre actuellement un script Rsync. Si la gnration du script prend plus de dix minutes, veuillez contacter {0}.
 file.rsyncUpload.step1=Assurez-vous que vos donnes sont stockes dans un seul rpertoire. Tous les fichiers de ce rpertoire et de ses sous-rpertoires seront tlverss dans votre ensemble de donnes.
 file.rsyncUpload.step2=Tlcharger ce script de tlversement de fichiers\u00A0:
 file.rsyncUpload.step2.downloadScriptButton=Tlcharger le script
 file.rsyncUpload.step3=Ouvrir une fentre de terminal dans le mme rpertoire que celui o vous avez enregistr le script et excuter cette commande\u00A0: bash ./{0}
 file.rsyncUpload.step4=Suivre les instructions du script. Il vous sera demand un chemin complet (commenant par  \u00A0/\u00A0) vers le rpertoire contenant vos donnes. Note\u00A0: ce script expirera aprs 7 jours.
-file.rsyncUpload.inProgressMessage.summary=Tlchargement de fichier DCM
+file.rsyncUpload.inProgressMessage.summary=Tlversement de fichier(s) par le module de capture de donnes (DCM) 
 file.rsyncUpload.inProgressMessage.details=Cet ensemble de donnes est verrouill jusqu' ce que les fichiers de donnes aient t transfrs et vrifis.
+file.rsyncUpload.httpUploadDisabledDueToRsyncFileExisting=Le tlversement HTTP est dsactiv pour cet ensemble de donnes car vous avez dj charg des fichiers via Rsync. Si vous souhaitez passer au tlversement HTTP, veuillez contacter {0}.
+file.rsyncUpload.httpUploadDisabledDueToRsyncFileExistingAndPublished=Le tlversement HTTP est dsactiv pour cet ensemble de donnes car vous avez dj charg des fichiers via Rsync et publi l'ensemble de donnes.
+file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp=Le tlversement avec Rsync + SSH est dsactiv pour cet ensemble de donnes car vous avez dj charg des fichiers via HTTP. Si vous souhaitez passer au tlversement avec Rsync, vous devez d'abord supprimer tous les fichiers tlverss de cet ensemble de donnes. Une fois cet ensemble de donnes publi, la mthode de tlversement choisie est dfinitivement verrouille.
+file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttpAndPublished=Le tlversement avec Rsync + SSH est dsactiv pour cet ensemble de donnes car vous avez dj tlvers des fichiers via HTTP et publi l'ensemble de donnes.
 
 file.metaData.dataFile.dataTab.variables=Variables
 file.metaData.dataFile.dataTab.observations=Observations
@@ -1401,8 +1435,8 @@ file.advancedIngestOptions=Options de chargement avanc
 file.assignedDataverseImage.success={0} a t sauvegarde comme vignette pour cet ensemble de donnes. 
 file.assignedTabFileTags.success=Les libells ont bien t ajouts pour {0}.
 file.tabularDataTags=Libells des donnes tabulaires
-file.tabularDataTags.tip=Slectionner un ou plusieurs libells dcrivant le type de fichier de donnes.
-file.spss-savEncoding=Encodage linguistique
+file.tabularDataTags.tip=Slectionner un libell qualifiant le ou les type(s) de donnes (enqute, srie chronologique, donnes gospatiales, etc.).
+file.spss-savEncoding=Encodage de la langue
 file.spss-savEncoding.title=Slectionner la langue utilise pour encoder ce fichier de donnes SPSS (sav).
 file.spss-savEncoding.current=Slection actuelle\u00A0:
 file.spss-porExtraLabels=Libells de variable
@@ -1416,8 +1450,8 @@ file.mapData.worldMap=WorldMap
 file.mapData.unpublished.header=Donnes non publies
 file.mapData.unpublished.message=Pour golocaliser vos donnes avec WorldMap, vos donnes doivent tre publies. Veuillez publier cet ensemble de donnes et essayer  nouveau.
 file.downloadBtn.format.all=Tous les formats de fichier + renseignements
-file.downloadBtn.format.tab=Spar par des tabulateurs
-file.downloadBtn.format.original=Format du fichier original ({0})
+file.downloadBtn.format.tab=Valeurs spares par tabulations
+file.downloadBtn.format.original=Format original du fichier ({0})
 file.downloadBtn.format.rdata=Format RData
 file.downloadBtn.format.var=Mtadonnes des variables
 file.downloadBtn.format.citation=Rfrence bibliographique du fichier de donnes
@@ -1428,7 +1462,7 @@ file.requestAccess.dialog.msg=Vous devez ouvrir un compte ou vous connecter pour pouvoir demander un accs  ce fichier.
 file.accessRequested=Accs demand
 file.restrictions=Restrictions d'accs aux fichiers
-file.restrictions.description=Limiter l'accs aux fichiers publis en les indiquant comme tant restreints. Fournir aux utilisateurs les Conditions d'accs et leur permettre de demander l'accs.
+file.restrictions.description=Limiter l'accs aux fichiers publis en les indiquant comme tant restreints. Fournir aux utilisateurs les conditions d'accs et leur permettre de demander l'accs.
 file.restrictions.worldmap.warning=Veuillez noter que, une fois vos modifications d'accs au fichier publies, votre carte sur WorldMap sera supprime et la fonction Explorer sur WorldMap sera retire.
 file.ingestInProgress=Chargement en cours\u2026
 file.dataFilesTab.metadata.header=Mtadonnes
@@ -1451,8 +1485,8 @@ file.dataFilesTab.terms.list.termsOfUse.termsOfUse.description=Si vous n'
 file.dataFilesTab.terms.list.termsOfUse.addInfo=Renseignements supplmentaires
 file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration=Dclaration de confidentialit
 file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title=Indique s'il faut signer une dclaration de confidentialit pour avoir accs  une ressource.
-file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions=Permissions spciales
-file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title=Dterminer si des permissions spciales sont requises pour avoir accs  une ressource (p.\u00A0ex. si un formulaire est ncessaire et o obtenir le formulaire).
+file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions=Autorisations spciales
+file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title=Dterminer si des autorisations spciales sont requises pour avoir accs  une ressource (p.\u00A0ex. si un formulaire est ncessaire et o obtenir le formulaire).
 file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions=Restrictions
 file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title=Toute restriction s'appliquant  l'accs  l'ensemble de donnes et  son utilisation, comme la certification relative  la vie prive ou les restrictions concernant la diffusion, doit tre indique  cet endroit. Il peut s'agir de restrictions tablies selon l'auteur, le producteur ou le diffuseur des donnes. Si l'accs aux donnes est limit  une certaine catgorie d'utilisateurs, veuillez le prciser. 
 file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements=Exigences de citation
@@ -1466,7 +1500,7 @@ file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title=Renseignements
 file.dataFilesTab.terms.list.termsOfAccess.header=Fichiers en accs rserv + Conditions d'accs
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles=Fichiers en accs rserv
 file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title=Nombre de fichiers en accs rserv dans cet ensemble de donnes
-file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt=Il y a {0} {0, choice, 0#fichiers|1#fichier|2#fichiers} en accs rserv dans cet ensemble de donnes.
+file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt=Il y a {0} {0, choice, 0#fichier|1#fichier|2#fichiers} en accs rserv dans cet ensemble de donnes.
 file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess=Conditions d'accs
 file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title=Renseignements sur la faon dont les utilisateurs peuvent avoir accs aux fichiers en accs rserv de cet ensemble de donnes. 
 file.dataFilesTab.terms.list.termsOfAccess.requestAccess=Demander l'accs
@@ -1493,7 +1527,7 @@ file.dataFilesTab.terms.list.guestbook.noSelected.admin.tip=Aucun registre des v
 file.dataFilesTab.terms.list.guestbook.inUse.tip=Le registre des visiteurs suivant demandera  un utilisateur de fournir des renseignements supplmentaires au moment du tlchargement d'un fichier.
 file.dataFilesTab.terms.list.guestbook.viewBtn=Prvisualiser le registre des visiteurs
 file.dataFilesTab.terms.list.guestbook.select.tip=Slectionner un registre des visiteurs afin qu'un utilisateur fournisse des renseignements supplmentaires lorsqu'il tlcharge un fichier.
-file.dataFilesTab.terms.list.guestbook.noAvailable.tip=Aucun registre des visiteurs n''est activ dans le {0}. Pour crer un registre des visiteurs, retournez dans le {0}, cliquez sur le bouton \u00A0Modifier\u00A0 et slectionnez \u00A0Registres de visiteurs pour l''ensemble de donnes\u00A0.
+file.dataFilesTab.terms.list.guestbook.noAvailable.tip=Aucun registre des visiteurs n''est activ dans le {0}. Pour crer un registre des visiteurs, retournez dans le {0}, cliquez sur le bouton \u00A0Modifier\u00A0 et slectionnez \u00A0Registres de visiteurs des ensembles de donnes\u00A0.
 file.dataFilesTab.terms.list.guestbook.clearBtn=Effacer la slection
 
 file.dataFilesTab.dataAccess=Accs aux donnes
@@ -1527,7 +1561,7 @@ file.dataFilesTab.versions.description.firstPublished=Il s'agit de la premi
 file.dataFilesTab.versions.description.deaccessionedReason=Raison du retrait\u00A0:
 file.dataFilesTab.versions.description.beAccessedAt=L'ensemble de donnes peut maintenant tre consult \u00A0:
 file.dataFilesTab.versions.viewDetails.btn=Voir les renseignements
-file.dataFilesTab.versions.widget.viewMoreInfo=Pour afficher plus d'informations sur les versions de cet ensemble de donnes et pour le modifier s''il s''agit de votre ensemble de donnes, consultez la version complte de cet ensemble  {2}.
+file.dataFilesTab.versions.widget.viewMoreInfo=Pour afficher plus d'informations sur les versions de cet ensemble de donnes et pour le modifier s''il s''agit de votre ensemble de donnes, consulter la version complte de cet ensemble  {2}.
 file.deleteDialog.tip=tes-vous sr(e) de vouloir supprimer cet ensemble de donnes? Vous ne pourrez pas annuler la suppression.
 file.deleteDialog.header=Supprimer l'ensemble de donnes
 file.deleteDraftDialog.tip=tes-vous sr(e) de vouloir supprimer cette version provisoire? Vous ne pourrez pas annuler la suppression de cette version. 
@@ -1606,22 +1640,22 @@ dataset.widgets.notPublished.why.reason2=Permet aux autres de parcourir votre da
 dataset.widgets.notPublished.how.header=Comment utiliser les widgets
 dataset.widgets.notPublished.how.tip1=Pour pouvoir utiliser des widgets, votre dataverse et vos ensembles de donnes doivent tre publis.
 dataset.widgets.notPublished.how.tip2=Suite  la publication, le code sera disponible sur cette page pour que vous puissiez le copier et l'ajouter  votre site web personnel ou de projet.
-dataset.widgets.notPublished.how.tip3=Avez-vous un site web OpenScholar? Si oui, apprenez-en davantage sur l'ajout de widgets Dataverse dans votre site web ici.
-dataset.widgets.notPublished.getStarted=Pour dbuter, publiez votre dataverse. Pour en apprendre davantage sur les widgets, consultez la section thme et widgets du guide d''utilisation.
+dataset.widgets.notPublished.how.tip3=Avez-vous un site web OpenScholar? Si oui, apprenez-en davantage sur l''ajout de widgets Dataverse dans votre site web ici.
+dataset.widgets.notPublished.getStarted=Pour dbuter, publiez votre dataverse. Pour en apprendre davantage sur les widgets, consulter la section thme et widgets du guide d''utilisation.
 dataset.widgets.editAdvanced=Modifier les options avances
 dataset.widgets.editAdvanced.tip=Options avances  Options supplmentaires pour configurer votre widget sur votre site personnel ou de projet.
-dataset.widgets.tip=Copiez et collez ce code dans le code HTML de votre site web. Pour en apprendre davantage sur les widgets, consultez la section Thme et widgets du guide d''utilisation.
+dataset.widgets.tip=Copier et coller ce code dans le code HTML de votre site web. Pour en apprendre davantage sur les widgets, consulter la section Thme et widgets du guide d''utilisation.
 dataset.widgets.citation.txt=Citation de l'ensemble de donnes
-dataset.widgets.citation.tip=Ajoutez la rfrence de votre ensemble de donnes  votre site personnel ou de projet.
+dataset.widgets.citation.tip=Ajouter la rfrence de votre ensemble de donnes  votre site personnel ou de projet.
 dataset.widgets.datasetFull.txt=Ensemble de donnes
 dataset.widgets.datasetFull.tip=Permet aux visiteurs de votre site web d'tre en mesure d'afficher vos ensembles de donnes, de tlcharger des fichiers, etc.
 dataset.widgets.advanced.popup.header=Widgets\u00A0: Options avances
 dataset.widgets.advanced.prompt=Expdier vers votre site web personnel l'URL prenne de la rfrence bibliographique de l'ensemble de donnes.
 dataset.widgets.advanced.url.label=URL de votre site web personnel
 dataset.widgets.advanced.url.watermark=http://www.exemple.com/nom-de-la-page
-dataset.widgets.advanced.invalid.message=Veuillez saisir un URL valide
+dataset.widgets.advanced.invalid.message=Veuillez saisir une URL valide
 dataset.widgets.advanced.success.message=Mise  jour russie de l'URL de votre site web personnel
-dataset.widgets.advanced.failure.message=L'URL du site web personnel n'a pas t mis  jour dans dataverse.
+dataset.widgets.advanced.failure.message=L'URL du site web personnel n'a pas t mise  jour dans dataverse.
 dataset.thumbnailsAndWidget.breadcrumbs.title=Vignette + Widgets
 dataset.thumbnailsAndWidget.thumbnails.title=Vignette
 dataset.thumbnailsAndWidget.widgets.title=Widgets
@@ -1638,9 +1672,9 @@ dataset.thumbnailsAndWidget.thumbnailImage.upload=T
 dataset.thumbnailsAndWidget.thumbnailImage.upload.invalidMsg=L'image n'a pas pu tre tlverse. Veuillez ressayer avec un fichier JPG, TIF ou PNG.
 dataset.thumbnailsAndWidget.success=Vignette de l'ensemble de donnes mise  jour.
 dataset.thumbnailsAndWidget.removeThumbnail=Supprimer la vignette
-dataset.thumbnailsAndWidget.removeThumbnail.tip=Vous ne supprimez que la vignette de l'ensemble de donnes et non pas le fichier d'image inclus dans votre ensemble de donnes. Pour ce faire, accdez  la page Modifier les fichiers.
+dataset.thumbnailsAndWidget.removeThumbnail.tip=Vous ne supprimez que la vignette de l'ensemble de donnes et non pas le fichier d'image inclus dans votre ensemble de donnes. Pour ce faire, accder  la page Modifier les fichiers.
 dataset.thumbnailsAndWidget.availableThumbnails=Vignettes disponibles
-dataset.thumbnailsAndWidget.availableThumbnails.tip=Slectionnez une vignette  partir d'un fichier de donnes provenant de votre ensemble de donnes. Revenir ensuite  la page Vignette + Widgets pour enregistrer vos modifications.
+dataset.thumbnailsAndWidget.availableThumbnails.tip=Slectionner une vignette  partir d'un fichier de donnes provenant de votre ensemble de donnes. Revenir ensuite  la page Vignette + Widgets pour enregistrer vos modifications.
 
 # file.xhtml
 file.share.fileShare=Partager le fichier
@@ -1648,8 +1682,11 @@ file.share.fileShare.tip=Partager ce fichier sur vos m
 file.share.fileShare.shareText=Afficher ce fichier.
 file.title.label=Titre
 file.citation.label=Rfrence bibliographique
-file.citation.notice=Ce fichier fait partie de \u00A0{0}\u00A0. Si vous utilisez ce fichier, prire de citer l''ensemble de donnes\u00A0:
+file.citation.notice=Ce fichier fait partie de \u00A0{0}\u00A0.
+file.citation.dataset=Rfrence bibliographique de l'ensemble de donnes
+file.citation.datafile=Rfrence bibliographique du fichier
 file.cite.downloadBtn=Citer l'ensemble de donnes
+file.cite.file.downloadBtn=Citer le fichier de l'ensemble de donnes
 file.pid.label=Identifiant permanent du fichier\u00A0:
 file.unf.lable= Fichier UNF\u00A0:
 file.general.metadata.label=Mtadonnes gnrales
@@ -1710,7 +1747,7 @@ file.addreplace.error.file_exceeds_limit=La taille de ce fichier ({0}) d
 file.addreplace.error.dataset_is_null=L'ensemble de donnes ne peut tre nul.
 file.addreplace.error.dataset_id_is_null=L'identifiant de l'ensemble de donnes ne peut tre nul.
 find.dataset.error.dataset_id_is_null=L''accs  un ensemble de donnes bas sur un identifiant prenne requiert qu''un paramtre de requte {0} soit prsent.
-find.dataset.error.dataset.not.found.persistentId=L''ensemble de donnes bas sur l'identifiant prenne {0} est introuvable.
+find.dataset.error.dataset.not.found.persistentId=L''ensemble de donnes bas sur l''identifiant prenne {0} est introuvable.
 find.dataset.error.dataset.not.found.id=L''ensemble de donnes ayant l''identifiant {0} est introuvable.
 find.dataset.error.dataset.not.found.bad.id=Identifiant de l''ensemble de donnes erron\u00A0: {0}.
 find.datasetlinking.error.not.found.ids=L''ensemble de donnes du dataverse li ayant l''identifiant d''ensemble de donnes {0} et l''ensemble de donnes du dataverse li ayant l''identifiant {1} sont introuvables.
@@ -1721,13 +1758,13 @@ find.datafile.error.datafile.not.found.id=Le fichier ayant l''identifiant {0} es
 find.datafile.error.datafile.not.found.bad.id=Identifiant de fichier erron\u00A0: {0}.
 find.datafile.error.dataset.not.found.persistentId=Le fichier de donnes ayant l''identifiant prenne {0} est introuvable.
 file.addreplace.error.dataset_id_not_found=Aucun ensemble de donnes n'a t trouv pour l'identifiant\u00A0:
-file.addreplace.error.no_edit_dataset_permission=Vous n'avez pas la permission de modifier cet ensemble de donnes.
+file.addreplace.error.no_edit_dataset_permission=Vous n'avez pas l'autorisation de modifier cet ensemble de donnes.
 file.addreplace.error.filename_undetermined=Le nom du fichier ne peut tre tabli.
 file.addreplace.error.file_content_type_undetermined=Le type de contenu du fichier ne peut tre tabli.
 file.addreplace.error.file_upload_failed=Le tlversement du fichier a chou.
 file.addreplace.error.duplicate_file=Ce fichier existe dj dans l'ensemble de donnes. 
 file.addreplace.error.existing_file_to_replace_id_is_null=L'identifiant du fichier existant  remplacer doit tre fourni.
-file.addreplace.error.existing_file_to_replace_not_found_by_id=Fichier de remplacement non trouv. Aucun fichier n''a t trouv pour l'identifiant\u00A0: {0}
+file.addreplace.error.existing_file_to_replace_not_found_by_id=Fichier de remplacement non trouv. Aucun fichier n''a t trouv pour l''identifiant\u00A0: {0}
 file.addreplace.error.existing_file_to_replace_is_null=Le fichier  remplacer ne peut tre nul.
 file.addreplace.error.existing_file_to_replace_not_in_dataset=Le fichier  remplacer n'appartient pas  cet ensemble de donnes.
 file.addreplace.error.existing_file_not_in_latest_published_version=Vous ne pouvez pas remplacer un fichier qui n'est pas dans le dernier ensemble de donnes publi. (Le fichier est non publi ou a t supprim d'une version prcdente.)
@@ -1802,7 +1839,7 @@ mydataFragment.search=Rechercher mes donn
 
 file.provenance=Provenance
 file.editProvenanceDialog=Provenance
-file.editProvenanceDialog.tip=Par provenance on entend l''enregistrement de l''origine de votre fichier de donnes ainsi que des transformations qu''il a subies. Tlcharger un fichier JSON  partir d''un outil de capture de provenance pour gnrer un graphique de la provenance de vos donnes. Pour plus d''informations, consultez notre guide d''utilisation.
+file.editProvenanceDialog.tip=Par provenance on entend l''enregistrement de l''origine de votre fichier de donnes ainsi que des transformations qu''il a subies. Tlcharger un fichier JSON  partir d''un outil de capture de provenance pour gnrer un graphique de la provenance de vos donnes. Pour plus d''informations, consulter notre guide d''utilisation.
 file.editProvenanceDialog.uploadSuccess=Tlversement complt.
 file.editProvenanceDialog.uploadError=Une erreur s'est produite lors du tlversement et de l'analyse de votre fichier de provenance.
 file.editProvenanceDialog.noEntitiesError=Le fichier de provenance tlvers ne contient aucune entit pouvant tre lie  votre fichier de donnes. 
@@ -1813,7 +1850,7 @@ file.editProvenanceDialog.bundleFile.alreadyPublished=Ce fichier de provenance a
 file.editProvenanceDialog.bundleEntity=Entit de fichier de donnes
 file.editProvenanceDialog.bundleEntity.placeholder=Connexion  l'entit\u2026
 file.editProvenanceDialog.bundleEntity.requiredValidation=Une valeur est requise.
-file.editProvenanceDialog.bundleEntity.tip=Slectionnez l'entit dans votre fichier de provenance qui reprsente votre fichier de donnes.
+file.editProvenanceDialog.bundleEntity.tip=Slectionner l'entit dans votre fichier de provenance qui reprsente votre fichier de donnes.
 file.editProvenanceDialog.bundleEntity.nameHeader=Nom
 file.editProvenanceDialog.bundleEntity.typeHeader=Type
 file.editProvenanceDialog.bundleEntity.entityHeader=Entit
@@ -1823,7 +1860,7 @@ file.editProvenanceDialog.description=Description de la provenance
 file.editProvenanceDialog.description.placeholder=Ajouter la description de la provenance\u2026
 file.confirmProvenanceDialog=Provenance
 file.confirmProvenanceDialog.tip1=Une fois que vous avez publi cet ensemble de donnes, votre fichier de provenance ne peut tre modifi ou remplac.
-file.confirmProvenanceDialog.tip2=Slectionnez \u00A0Annuler\u00A0 afin de retourner  la page prcdente, o vous pouvez prvisualiser votre fichier de provenance pour confirmer qu'il est conforme.
+file.confirmProvenanceDialog.tip2=Slectionner \u00A0Annuler\u00A0 afin de retourner  la page prcdente. Vous pourrez alors prvisualiser votre fichier de provenance pour confirmer qu'il est conforme.
 file.metadataTab.provenance.header=Fichier de provenance
 file.metadataTab.provenance.body=Informations sur le fichier de provenance  venir dans une version ultrieure\u2026
 file.metadataTab.provenance.error=En raison d'une erreur interne, vos informations de provenance n'ont pas t enregistres correctement
@@ -1894,9 +1931,10 @@ dataverse.item.required=Obligatoire
 dataverse.item.optional=Facultatif
 dataverse.item.hidden=Information cache
 dataverse.edit.msg=Modifier le dataverse
-dataverse.edit.detailmsg= \u2014 Modifier votre dataverse puis cliquer sur Enregistrer. Les astrisques indiquent les champs obligatoires
+dataverse.edit.detailmsg=Modifier votre dataverse puis cliquer sur Enregistrer les modifications. Les astrisques indiquent les champs obligatoires
 dataverse.feature.update=Les dataverses en vedette pour ce dataverse ont t mis  jour.
 dataverse.link.select=Vous devez slectionner un dataverse li.
+dataset.noSelectedDataverse.header=Slectionner le(s) dataverse(s)
 dataverse.link.user=Seuls les utilisateurs authentifis peuvent lier un dataverse.
 dataverse.link.error=Impossible de lier {0}  {1}. Une erreur interne est survenue.
 dataverse.search.user=Seuls les utilisateurs authentifis peuvent enregistrer une recherche.
@@ -1931,6 +1969,7 @@ harvest.save.failure2=
 
 #HarvestingSetsPage.java
 harvest.oaicreate.fail=chec de la cration de l'ensemble OAI
+harvest.oaicreate.defaultset.fail=chec de la cration de l'ensemble OAI par dfaut
 harvest.oaiupdate.fail=chec de la mise  jour de l'ensemble OAI.
 harvest.oaiupdate.success=Mise  jour de l''ensemble OAI \u00A0{0}\u00A0 russie.
 harvest.delete.fail=chec de la suppression de l'ensemble moissonn; exception inconnue\u00A0: 
@@ -1938,7 +1977,7 @@ harvest.reexport.fail=D
 harvest.search.failed=La recherche a chou pour la requte fournie. Message du serveur de recherche Dataverse\u00A0:
 
 #LoginPage.java
-login.UserName/Email=Veuillez entrer un nom d'utilisateur.
+login.Username/Email=Veuillez entrer un nom d'utilisateur.
 login.Password=Veuillez entrer un mot de passe.
 
 #SystemConfig.java
@@ -1957,7 +1996,7 @@ dataset.notlinked.msg=Un probl
 #ThemeWidgetFragment.java
 theme.validateTagline=Le titre d'appel doit comporter au maximum 140 caractres.
 theme.urlValidate=La validation d'URL a chou.
-theme.urlValidate.msg=Prire de fournir un URL.
+theme.urlValidate.msg=Prire de fournir une URL.
 dataverse.save.failed=chec de l'enregistrement Dataverse \u2014
 
 #LinkValidator.java
@@ -1991,9 +2030,9 @@ permission.roleAssignedToFor=R
 permission.roleNotAssignedFor=Rle {0} N''A PU TRE assign  {1} pour {2}.
 permission.updated=mis  jour
 permission.created=cr
-permission.roleWas=Le rle tait {0}. Pour l''attribuer  un utilisateur et/ou un groupe, cliquer sur le bouton \u00A0Assigner des rles aux utilisateurs/groupes\u00A0 dans la section Utilisateurs/Groupes de cette page.
+permission.roleWas=Le rle a t {0}. Pour l''attribuer  un utilisateur et/ou un groupe, cliquer sur le bouton \u00A0Assigner des rles aux utilisateurs/groupes\u00A0 dans la section Utilisateurs/Groupes de cette page.
 permission.roleNotSaved=Le rle n'a pu tre sauvegard.
-permission.permissionsMissing= Les permissions {0} sont manquantes.
+permission.permissionsMissing= Les autorisations {0} sont manquantes.
 permission.CannotAssigntDefaultPermissions=Impossible d'attribuer des autorisations par dfaut.
 
 #ManageFilePermissionsPage.java
@@ -2027,10 +2066,137 @@ page.copy=Copie de
 permission.roleAssignedToOn=Rle {0} assign  {1} pour {2}
 permission.cannotAssignRole=Le rle n''a pu tre assign\u00A0: {0}
 permission.roleRevoked=Attribution de rle rvoque avec succs
-permission.cannotRevokeRole1=Impossible de rvoquer l''attribution de rle \u2014 il vous manque la permission {0}
+permission.cannotRevokeRole1=Impossible de rvoquer l''attribution de rle \u2014 il vous manque l''autorisation {0}
 permission.cannotRevokeRole2=Impossible de rvoquer l''attribution de rle\u00A0: {0}
 permission.roleSave=Le rle \u00A0{0}\u00A0 a t sauvegard
 permission.cannotSaveRole=Impossible de sauvegarder le rle {0}
 
 #GlobalId.java
-pid.allowedCharacters=^[A-Za-z0-9._/:\\-]*
\ No newline at end of file
+pid.allowedCharacters=^[A-Za-z0-9._/:\\-]*
+
+#Admin-API
+admin.api.auth.mustBeSuperUser=Interdit. Vous devez tre un super-utilisateur.
+admin.api.migrateHDL.failure.must.be.set.for.doi=Peut ne pas tre migr lorsque le protocole d'installation est dfini avec "hdl". Le protocole doit tre "doi".
+admin.api.migrateHDL.failure.must.be.hdl.dataset=L'ensemble de donnes n'a pas t enregistr en tant que HDL. Il ne peut pas tre migr.
+admin.api.migrateHDL.success=La migration de l'ensemble de donnes est termine. Ensemble de donnes r-enregistr avec succs.
+admin.api.migrateHDL.failure=chec de la migration de l'ensemble de donnes ayant l''identifiant Handle\u00A0: {0} 
+admin.api.migrateHDL.failureWithException=chec de la migration de l'ensemble de donnes ayant l''identifiant Handle\u00A0: {0}. Exception inattendue\u00A0: {1}
+
+#Datasets.java
+datasets.api.updatePIDMetadata.failure.dataset.must.be.released=La modification des mtadonnes d'identification permanente doit tre excute sur un ensemble de donnes publi.
+datasets.api.updatePIDMetadata.auth.mustBeSuperUser=Interdit. Vous devez tre un super-utilisateur.
+datasets.api.updatePIDMetadata.success.for.single.dataset=Les mtadonnes d''identification permanente de l''ensemble de donnes {0} ont bien t mises  jour.
+datasets.api.updatePIDMetadata.success.for.update.all=Les mtadonnes d''identification permanente de tous les ensembles de donnes ont bien t mises  jour.
+
+#permission
+permission.AddDataverse.label=AjoutDataverse
+permission.AddDataset.label=AjoutEnsembleDeDonnes
+permission.ViewUnpublishedDataverse.label=ConsultationDataverseNonPubli
+permission.ViewUnpublishedDataset.label=ConsultationEnsembleDeDonnesNonPubli
+permission.DownloadFile.label=TlchargementFichier
+permission.EditDataverse.label=ditionDataverse
+permission.EditDataset.label=ditionEnsembleDeDonnes
+permission.ManageDataversePermissions.label=GestionAutorisationsDataverse
+permission.ManageDatasetPermissions.label=GestionAutorisationsEnsembleDeDonnes
+permission.PublishDataverse.label=PublicationDataverse
+permission.PublishDataset.label=PublicationEnsembleDeDonnes
+permission.DeleteDataverse.label=SuppressionDataverse
+permission.DeleteDatasetDraft.label=SuppressionVersionProvisoireEnsembleDeDonnes
+
+permission.AddDataverse.desc=Ajouter un dataverse  l'intrieur d'un autre dataverse
+permission.DeleteDatasetDraft.desc=Supprimer la version provisoire d'un ensemble de donnes
+permission.DeleteDataverse.desc=Supprimer un dataverse non publi
+permission.PublishDataset.desc=Publier un ensemble de donnes
+permission.PublishDataverse.desc=Publier un dataverse
+permission.ManageDatasetPermissions.desc=Grer les autorisations pour un ensemble de donnes
+permission.ManageDataversePermissions.desc=Grer les autorisations pour un dataverse
+permission.EditDataset.desc=diter les mtadonnes d'un ensemble de donnes
+permission.EditDataverse.desc=diter les mtadonnes, les facettes, le paramtrage et les modles d'un Dataverse
+permission.DownloadFile.desc=Tlcharger un fichier
+permission.ViewUnpublishedDataset.desc=Consulter un ensemble de donnes non publi et ses fichiers
+permission.ViewUnpublishedDataverse.desc=Consulter un dataverse non publi
+permission.AddDataset.desc=Ajouter un ensemble de donnes  un dataverse
+
+#mydata_fragment.xhtml
+Published=Publi
+Unpublished=Non publi
+Draft=Version provisoire
+In\u0020Review=En rvision
+Deaccessioned=Retir
+
+#Managegroupspage.java
+dataverse.manageGroups.user=utilisateur
+dataverse.manageGroups.users=utilisateurs
+dataverse.manageGroups.group=groupe
+dataverse.manageGroups.groups=groupes
+dataverse.manageGroups.nomembers=Aucun membre
+dataverse.manageGroups.unknown=inconnu
+dataverse.manageGroups.User=Utilisateur
+dataverse.manageGroups.Group=Groupe
+
+#editFilesFragment.xhtml
+editfilesfragment.mainlabel=Slectionner l'encodage de la langue\u2026
+editfilesfragment.label1=Europe de l'ouest
+editfilesfragment.label1.item1=Latin (ISO-8859-1)
+editfilesfragment.label1.item2=Latin (ISO-8859-15)
+editfilesfragment.label1.item3=Latin (Windows-1252)
+editfilesfragment.label1.item4=Latin (MacRoman)
+editfilesfragment.label1.item5=Latin (IBM-850)
+editfilesfragment.label1.item6=Celte (ISO-8859-14)
+editfilesfragment.label1.item7=Grec (ISO-8859-7)
+editfilesfragment.label1.item8=Grec (Windows-1253)
+editfilesfragment.label1.item9=Grec (MacGreek)
+editfilesfragment.label1.item10=Islandais (MacIcelandic)
+editfilesfragment.label1.item11=Nordique (ISO-8859-10)
+editfilesfragment.label1.item12=Europe du sud (ISO-8859-3)
+editfilesfragment.label2=Europe de l'est
+editfilesfragment.label2.item1=Balte (ISO-8859-4)
+editfilesfragment.label2.item2=Balte (ISO-8859-13)
+editfilesfragment.label2.item3=Balte (Windows-1257)
+editfilesfragment.label2.item4=Cyrillique (ISO-8859-5)
+editfilesfragment.label2.item5=Cyrillique (ISO-IR-111)
+editfilesfragment.label2.item6=Cyrillique (Windows-1251)
+editfilesfragment.label2.item7=Cyrillique (MacCyrillic)
+editfilesfragment.label2.item8=Cyrillique/Ukrainien (MacUkrainian)
+editfilesfragment.label2.item9=Cyrillique (KOI8-R)
+editfilesfragment.label2.item10=Cyrillique/Ukrainien (KOI8-U)
+editfilesfragment.label2.item11=Croate (MacCroatian)
+editfilesfragment.label2.item12=Roumain (MacRomanian)
+editfilesfragment.label2.item13=Roumain (ISO-8859-16)
+editfilesfragment.label2.item14=Europe centrale (ISO-8859-2)
+editfilesfragment.label2.item15=Europe centrale (Windows-1250)
+editfilesfragment.label2.item16=Europe centrale (MacCE)
+editfilesfragment.label2.item17=Cyrillique (IBM-855)
+editfilesfragment.label3=Asie de l'est
+editfilesfragment.label3.item1=Japonais (ISO-2022-JP)
+editfilesfragment.label3.item2=Japonais (Shift_JIS)
+editfilesfragment.label3.item3=Japonais (EUC-JP)
+editfilesfragment.label3.item4=Chinois traditionnel (Big5)
+editfilesfragment.label3.item5=Chinois traditionnel (Big5-HKSCS)
+editfilesfragment.label3.item6=Chinois traditionnel (EUC-TW)
+editfilesfragment.label3.item7=Chinois simplifi (GB2312)
+editfilesfragment.label3.item8=Chinois simplifi (HZ)
+editfilesfragment.label3.item9=Chinois simplifi (GBK)
+editfilesfragment.label3.item10=Chinois simplifi (ISO-2022-CN)
+editfilesfragment.label3.item11=Coren (EUC-KR)
+editfilesfragment.label3.item12=Coren (JOHAB)
+editfilesfragment.label3.item13=Coren (ISO-2022-KR)
+editfilesfragment.label4=Unicode
+editfilesfragment.label4.item1=Unicode (UTF-8)
+editfilesfragment.label4.item2=Unicode (UTF-16LE)
+editfilesfragment.label4.item3=Unicode (UTF-16BE)
+editfilesfragment.label5=US-ASCII
+
+isrequired=est requis(e).
+draftversion=VERSION PROVISOIRE
+deaccessionedversion=VERSION RETIRE
+
+not_restricted=Accs sans restrictions
+editdatafilepage.defaultLanguageEncoding=UTF8 (dfaut)
+passwdVal.passwdReq.each=chacun 
+passwdVal.passwdReq.uppercase=majuscule
+passwdVal.passwdReq.lowercase=minuscule
+passwdVal.passwdReq.letter=lettre
+passwdVal.passwdReq.numeral=chiffre
+passwdVal.passwdReq.special=caractre spcial
+dataretrieverAPI.noMsgResultsFound=Dsol, aucun rsultat n'a t trouv.
\ No newline at end of file
diff --git a/src/main/java/MimeTypeDisplay_fr.properties b/src/main/java/MimeTypeDisplay_fr.properties
new file mode 100644
index 00000000000..7fb56a48304
--- /dev/null
+++ b/src/main/java/MimeTypeDisplay_fr.properties
@@ -0,0 +1,53 @@
+# MimeTypeDisplay properties file
+# User friendly names for displaying mime types.
+# Documentation, Data, Archive files:
+application/pdf=Adobe PDF
+application/msword=MS Word
+application/vnd.ms-excel=MS Excel
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=MS Excel (XLSX)
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=MS Word (docx)
+application/zip=Archive compresse ZIP
+text/plain=Texte
+text/xml=XML
+text/tab-separated-values=Valeurs spares par tabulations
+text/tsv=Valeurs spares par tabulations
+text/csv=Valeurs spares par des virgules
+text/x-fixed-field=Donnes textuelles  champ fixe
+application/x-rlang-transport=Donnes R
+type/x-r-syntax=Syntaxe R
+application/x-R-2=Format binaire R
+application/x-stata=Format binaire Stata
+application/x-stata-6=Format binaire Stata
+application/x-stata-13=Format binaire Stata 13
+application/x-stata-14=Format binaire Stata 14
+application/x-stata-15=Format binaire Stata 15
+text/x-stata-syntax=Syntaxe Stata
+application/x-spss-por=SPSS Portable
+application/x-spss-sav=SPSS SAV
+text/x-spss-syntax=Syntaxe SPSS
+application/x-sas-transport=SAS Transport
+application/x-sas-system=SAS System
+text/x-sas-syntax=SAS Syntax
+application/x-dvn-csvspss-zip=CSV (carte w/SPSS)
+application/x-dvn-tabddi-zip=TAB (w/DDI)
+application/fits=FITS
+#Images files
+image/gif=Image GIF
+image/jpeg=Image JPEG
+image/x-portable-bitmap=Image Bitmap
+image/x-portable-graymap=Image Graymap
+image/png=Image PNG
+image/x-portable-anymap=Image Anymap 
+image/x-portable-pixmap=Image Pixmap 
+image/cmu-raster=Image CMU Raster
+image/x-rgb=Image RGB
+image/tiff=Image TIFF
+image/x-xbitmap=Image XBitmap
+image/x-xpixmap=Image XPixmap
+image/x-xwindowdump=Image XWD
+# Network Data files
+text/xml-graphml=Donnes en rseau GraphML
+# Other
+application/octet-stream=Inconnu
+# Dataverse-specific
+application/vnd.dataverse.file-package=Ensemble Dataverse
\ No newline at end of file
diff --git a/src/main/java/MimeTypeFacets_fr.properties b/src/main/java/MimeTypeFacets_fr.properties
new file mode 100644
index 00000000000..30a4e09b979
--- /dev/null
+++ b/src/main/java/MimeTypeFacets_fr.properties
@@ -0,0 +1,62 @@
+# MimeTypeFacets properties file
+# Defines "facetable" groups of files by mime type;
+# For example, all image formats will be grouped under "image", etc.
+#
+# Documentation:
+application/pdf=Document
+application/msword=Document
+application/vnd.ms-excel=Document
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=Document
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=Document
+# Text:
+text/plain=Texte
+text/xml=Texte
+# Ingested
+text/tab-separated-values=Donnes tabulaires
+
+# Data files:
+text/tsv=Donnes
+text/csv=Donnes
+text/x-fixed-field=Donnes
+application/x-rlang-transport=Donnes
+type/x-r-syntax=Donnes
+application/x-R-2=Donnes
+application/x-stata=Donnes
+application/x-stata-6=Donnes
+application/x-stata-13=Donnes
+application/x-stata-14=Donnes
+application/x-stata-15=Donnes
+text/x-stata-syntax=Donnes
+application/x-spss-por=Donnes
+application/x-spss-sav=Donnes
+text/x-spss-syntax=Donnes
+application/x-sas-transport=Donnes
+application/x-sas-system=Donnes
+text/x-sas-syntax=Donnes
+application/x-dvn-csvspss-zip=Donnes
+application/x-dvn-tabddi-zip=Donnes
+application/fits=FITS
+application/zipped-shapefile=Formes
+# Archive files:
+application/zip=ZIP
+# Images files
+# (should be safe to just split the mime type on "/" in "image/*" though...)
+image/gif=Image
+image/jpeg=Image
+image/x-portable-bitmap=Image
+image/x-portable-graymap=Image
+image/png=Image
+image/x-portable-anymap=Image
+image/x-portable-pixmap=Image
+image/cmu-raster=Image
+image/x-rgb=Image
+image/tiff=Image
+image/x-xbitmap=Image
+image/x-xpixmap=Image
+image/x-xwindowdump=Image
+# Network Data files
+text/xml-graphml=Donnes en rseau
+# Other
+application/octet-stream=Inconnu
+# Dataverse-specific
+application/vnd.dataverse.file-package=Donnes
\ No newline at end of file
diff --git a/src/main/java/astrophysics.properties b/src/main/java/astrophysics.properties
new file mode 100644
index 00000000000..f91095eca2c
--- /dev/null
+++ b/src/main/java/astrophysics.properties
@@ -0,0 +1,104 @@
+metadatablock.name=astrophysics
+metadatablock.displayName=Astronomy and Astrophysics Metadata
+datasetfieldtype.astroType.title=Type
+datasetfieldtype.astroFacility.title=Facility
+datasetfieldtype.astroInstrument.title=Instrument
+datasetfieldtype.astroObject.title=Object
+datasetfieldtype.resolution.Spatial.title=Spatial Resolution
+datasetfieldtype.resolution.Spectral.title=Spectral Resolution
+datasetfieldtype.resolution.Temporal.title=Time Resolution
+datasetfieldtype.coverage.Spectral.Bandpass.title=Bandpass
+datasetfieldtype.coverage.Spectral.CentralWavelength.title=Central Wavelength (m)
+datasetfieldtype.coverage.Spectral.Wavelength.title=Wavelength Range
+datasetfieldtype.coverage.Spectral.MinimumWavelength.title=Minimum (m)
+datasetfieldtype.coverage.Spectral.MaximumWavelength.title=Maximum (m)
+datasetfieldtype.coverage.Temporal.title=Dataset Date Range
+datasetfieldtype.coverage.Temporal.StartTime.title=Start
+datasetfieldtype.coverage.Temporal.StopTime.title=End
+datasetfieldtype.coverage.Spatial.title=Sky Coverage
+datasetfieldtype.coverage.Depth.title=Depth Coverage
+datasetfieldtype.coverage.ObjectDensity.title=Object Density
+datasetfieldtype.coverage.ObjectCount.title=Object Count
+datasetfieldtype.coverage.SkyFraction.title=Fraction of Sky
+datasetfieldtype.coverage.Polarization.title=Polarization
+datasetfieldtype.redshiftType.title=RedshiftType
+datasetfieldtype.resolution.Redshift.title=Redshift Resolution
+datasetfieldtype.coverage.RedshiftValue.title=Redshift Value
+datasetfieldtype.coverage.Redshift.MinimumValue.title=Minimum
+datasetfieldtype.coverage.Redshift.MaximumValue.title=Maximum
+datasetfieldtype.astroType.description=The nature or genre of the content of the files in the dataset.
+datasetfieldtype.astroFacility.description=The observatory or facility where the data was obtained. 
+datasetfieldtype.astroInstrument.description=The instrument used to collect the data.
+datasetfieldtype.astroObject.description=Astronomical Objects represented in the data (Given as SIMBAD recognizable names preferred).
+datasetfieldtype.resolution.Spatial.description=The spatial (angular) resolution that is typical of the observations, in decimal degrees.
+datasetfieldtype.resolution.Spectral.description=The spectral resolution that is typical of the observations, given as the ratio λ/Δλ.
+datasetfieldtype.resolution.Temporal.description=The temporal resolution that is typical of the observations, given in seconds.
+datasetfieldtype.coverage.Spectral.Bandpass.description=Conventional bandpass name
+datasetfieldtype.coverage.Spectral.CentralWavelength.description=The central wavelength of the spectral bandpass, in meters.
+datasetfieldtype.coverage.Spectral.Wavelength.description=The minimum and maximum wavelength of the spectral bandpass.
+datasetfieldtype.coverage.Spectral.MinimumWavelength.description=The minimum wavelength of the spectral bandpass, in meters.
+datasetfieldtype.coverage.Spectral.MaximumWavelength.description=The maximum wavelength of the spectral bandpass, in meters.
+datasetfieldtype.coverage.Temporal.description= Time period covered by the data.
+datasetfieldtype.coverage.Temporal.StartTime.description=Dataset Start Date
+datasetfieldtype.coverage.Temporal.StopTime.description=Dataset End Date
+datasetfieldtype.coverage.Spatial.description=The sky coverage of the data object.
+datasetfieldtype.coverage.Depth.description=The (typical) depth coverage, or sensitivity, of the data object in Jy.
+datasetfieldtype.coverage.ObjectDensity.description=The (typical) density of objects, catalog entries, telescope pointings, etc., on the sky, in number per square degree.
+datasetfieldtype.coverage.ObjectCount.description=The total number of objects, catalog entries, etc., in the data object.
+datasetfieldtype.coverage.SkyFraction.description=The fraction of the sky represented in the observations, ranging from 0 to 1.
+datasetfieldtype.coverage.Polarization.description=The polarization coverage
+datasetfieldtype.redshiftType.description=RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.
+datasetfieldtype.resolution.Redshift.description=The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.
+datasetfieldtype.coverage.RedshiftValue.description=The value of the redshift (unitless) or Doppler velocity (km/s in the data object.
+datasetfieldtype.coverage.Redshift.MinimumValue.description=The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.
+datasetfieldtype.coverage.Redshift.MaximumValue.description=The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.
+datasetfieldtype.astroType.watermark=
+datasetfieldtype.astroFacility.watermark=
+datasetfieldtype.astroInstrument.watermark=
+datasetfieldtype.astroObject.watermark=
+datasetfieldtype.resolution.Spatial.watermark=
+datasetfieldtype.resolution.Spectral.watermark=
+datasetfieldtype.resolution.Temporal.watermark=
+datasetfieldtype.coverage.Spectral.Bandpass.watermark=
+datasetfieldtype.coverage.Spectral.CentralWavelength.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Spectral.Wavelength.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Spectral.MinimumWavelength.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Spectral.MaximumWavelength.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Temporal.watermark=
+datasetfieldtype.coverage.Temporal.StartTime.watermark=YYYY-MM-DD
+datasetfieldtype.coverage.Temporal.StopTime.watermark=YYYY-MM-DD
+datasetfieldtype.coverage.Spatial.watermark=
+datasetfieldtype.coverage.Depth.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.ObjectDensity.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.ObjectCount.watermark=Enter an integer.
+datasetfieldtype.coverage.SkyFraction.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Polarization.watermark=
+datasetfieldtype.redshiftType.watermark=
+datasetfieldtype.resolution.Redshift.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.RedshiftValue.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Redshift.MinimumValue.watermark=Enter a floating-point number.
+datasetfieldtype.coverage.Redshift.MaximumValue.watermark=Enter a floating-point number.
+controlledvocabulary.astroType.image=Image
+controlledvocabulary.astroType.mosaic=Mosaic
+controlledvocabulary.astroType.eventlist=EventList
+controlledvocabulary.astroType.spectrum=Spectrum
+controlledvocabulary.astroType.cube=Cube
+controlledvocabulary.astroType.table=Table
+controlledvocabulary.astroType.catalog=Catalog
+controlledvocabulary.astroType.lightcurve=LightCurve
+controlledvocabulary.astroType.simulation=Simulation
+controlledvocabulary.astroType.figure=Figure
+controlledvocabulary.astroType.artwork=Artwork
+controlledvocabulary.astroType.animation=Animation
+controlledvocabulary.astroType.prettypicture=PrettyPicture
+controlledvocabulary.astroType.documentation=Documentation
+controlledvocabulary.astroType.other=Other
+controlledvocabulary.astroType.library=Library
+controlledvocabulary.astroType.press_release=Press Release
+controlledvocabulary.astroType.facsimile=Facsimile
+controlledvocabulary.astroType.historical=Historical
+controlledvocabulary.astroType.observation=Observation
+controlledvocabulary.astroType.object=Object
+controlledvocabulary.astroType.value=Value
+controlledvocabulary.astroType.valuepair=ValuePair
+controlledvocabulary.astroType.survey=Survey
\ No newline at end of file
diff --git a/src/main/java/astrophysics_fr.properties b/src/main/java/astrophysics_fr.properties
new file mode 100644
index 00000000000..41b8cf121bf
--- /dev/null
+++ b/src/main/java/astrophysics_fr.properties
@@ -0,0 +1,104 @@
+metadatablock.name=astrophysics
+metadatablock.displayName=Mtadonnes lies  l'astronomie et  l'astrophysique
+datasetfieldtype.astroType.title=Type
+datasetfieldtype.astroFacility.title=Installation
+datasetfieldtype.astroInstrument.title=Instrument
+datasetfieldtype.astroObject.title=Objet
+datasetfieldtype.resolution.Spatial.title=Rsolution spatiale
+datasetfieldtype.resolution.Spectral.title=Rsolution spectrale
+datasetfieldtype.resolution.Temporal.title=Rsolution temporelle
+datasetfieldtype.coverage.Spectral.Bandpass.title=Largeur de bande
+datasetfieldtype.coverage.Spectral.CentralWavelength.title=Longueur d'onde centrale (m)
+datasetfieldtype.coverage.Spectral.Wavelength.title=Gamme de longueurs d'onde
+datasetfieldtype.coverage.Spectral.MinimumWavelength.title=Minimum (m)
+datasetfieldtype.coverage.Spectral.MaximumWavelength.title=Maximum (m)
+datasetfieldtype.coverage.Temporal.title=Priode de l'ensemble de donnes
+datasetfieldtype.coverage.Temporal.StartTime.title=Dbut
+datasetfieldtype.coverage.Temporal.StopTime.title=Fin
+datasetfieldtype.coverage.Spatial.title=Partie du ciel couverte
+datasetfieldtype.coverage.Depth.title=tendue
+datasetfieldtype.coverage.ObjectDensity.title=Densit de l'objet
+datasetfieldtype.coverage.ObjectCount.title=Nombre d'objets
+datasetfieldtype.coverage.SkyFraction.title=Fraction de ciel
+datasetfieldtype.coverage.Polarization.title=Polarisation
+datasetfieldtype.redshiftType.title=TypeDeDcalageVersLeRouge
+datasetfieldtype.resolution.Redshift.title=Rsolution du dcalage vers le rouge
+datasetfieldtype.coverage.RedshiftValue.title=Valeur du dcalage vers le rouge
+datasetfieldtype.coverage.Redshift.MinimumValue.title=Minimum  
+datasetfieldtype.coverage.Redshift.MaximumValue.title=Maximum  
+datasetfieldtype.astroType.description=La nature ou le genre du contenu des fichiers dans l'ensemble de donnes.
+datasetfieldtype.astroFacility.description=L'observatoire ou l'installation o les donnes ont t obtenues.
+datasetfieldtype.astroInstrument.description=L'instrument utilis pour recueillir les donnes.
+datasetfieldtype.astroObject.description=Les objets astronomiques reprsents dans les donnes (Il faut donner, de prfrence, des noms reconnaissables par SIMBAD.)
+datasetfieldtype.resolution.Spatial.description=La rsolution spatiale (angulaire) typique des observations, en degrs dcimaux.
+datasetfieldtype.resolution.Spectral.description=La rsolution spectrale typique des observations, indique sous forme de ratio  ?/??.
+datasetfieldtype.resolution.Temporal.description=La rsolution temporelle typique des observations, indique en secondes.
+datasetfieldtype.coverage.Spectral.Bandpass.description=Nom courant de la largeur de bande
+datasetfieldtype.coverage.Spectral.CentralWavelength.description=La longueur d'onde centrale de la largeur de bande spectrale, en mtres.
+datasetfieldtype.coverage.Spectral.Wavelength.description=La longueur d'onde minimale et maximale de la largeur de bande spectrale.
+datasetfieldtype.coverage.Spectral.MinimumWavelength.description=La longueur d'onde minimale de la largeur de bande spectrale, en mtres.
+datasetfieldtype.coverage.Spectral.MaximumWavelength.description=La longueur d'onde maximale de la largeur de bande spectrale, en mtres.
+datasetfieldtype.coverage.Temporal.description=Priode vise par les donnes.
+datasetfieldtype.coverage.Temporal.StartTime.description=Date de dbut de l'ensemble de donnes
+datasetfieldtype.coverage.Temporal.StopTime.description=Date de fin de l'ensemble de donnes
+datasetfieldtype.coverage.Spatial.description=Partie du ciel couverte par l'objet.
+datasetfieldtype.coverage.Depth.description=L'tendue (typique) ou sensibilit de l'objet de donnes en Jy.
+datasetfieldtype.coverage.ObjectDensity.description=La densit (typique) des objets, des entres du catalogue, des vises du tlescope, etc. dans le ciel, en chiffres par degr carr.
+datasetfieldtype.coverage.ObjectCount.description=Le nombre total d'objets, d'entres au catalogue, etc. dans l'objet de donnes.
+datasetfieldtype.coverage.SkyFraction.description=La fraction de ciel reprsente dans les observations, variant de 0  1.
+datasetfieldtype.coverage.Polarization.description=La couverture de la polarisation
+datasetfieldtype.redshiftType.description=La chane TypeDeDcalageVersLeRouge C \u00A0dcalage vers le rouge\u00A0 ou les dfinitions \u00A0optiques\u00A0 ou \u00A0radio\u00A0 de la vitesse Doppler utilises dans l'objet de donnes.
+datasetfieldtype.resolution.Redshift.description=La rsolution en dcalage vers le rouge (sans unit) ou la vitesse Doppler (km/s) dans l'objet de donnes.
+datasetfieldtype.coverage.RedshiftValue.description=La valeur du dcalage vers le rouge (sans unit) ou la vitesse Doppler (km/s dans l'objet de donnes).
+datasetfieldtype.coverage.Redshift.MinimumValue.description=La valeur minimale du dcalage vers le rouge (sans unit) ou la vitesse Doppler (km/s dans l'objet de donnes).
+datasetfieldtype.coverage.Redshift.MaximumValue.description=La valeur maximale du dcalage vers le rouge (sans unit) ou la vitesse Doppler (km/s dans l'objet de donnes).
+datasetfieldtype.astroType.watermark=
+datasetfieldtype.astroFacility.watermark=
+datasetfieldtype.astroInstrument.watermark=
+datasetfieldtype.astroObject.watermark=
+datasetfieldtype.resolution.Spatial.watermark=
+datasetfieldtype.resolution.Spectral.watermark=
+datasetfieldtype.resolution.Temporal.watermark=
+datasetfieldtype.coverage.Spectral.Bandpass.watermark=
+datasetfieldtype.coverage.Spectral.CentralWavelength.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Spectral.Wavelength.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Spectral.MinimumWavelength.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Spectral.MaximumWavelength.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Temporal.watermark=
+datasetfieldtype.coverage.Temporal.StartTime.watermark=AAAA-MM-JJ
+datasetfieldtype.coverage.Temporal.StopTime.watermark=AAAA-MM-JJ
+datasetfieldtype.coverage.Spatial.watermark=
+datasetfieldtype.coverage.Depth.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.ObjectDensity.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.ObjectCount.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.SkyFraction.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Polarization.watermark=
+datasetfieldtype.redshiftType.watermark=
+datasetfieldtype.resolution.Redshift.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.RedshiftValue.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Redshift.MinimumValue.watermark=Entrer un nombre  virgule flottante.
+datasetfieldtype.coverage.Redshift.MaximumValue.watermark=Entrer un nombre  virgule flottante.
+controlledvocabulary.astroType.image=Image
+controlledvocabulary.astroType.mosaic=Mosaque
+controlledvocabulary.astroType.eventlist=Liste d'vnements
+controlledvocabulary.astroType.spectrum=Spectre
+controlledvocabulary.astroType.cube=Cube
+controlledvocabulary.astroType.table=Tableau
+controlledvocabulary.astroType.catalog=Catalogue
+controlledvocabulary.astroType.lightcurve=Courbe de lumire
+controlledvocabulary.astroType.simulation=Simulation
+controlledvocabulary.astroType.figure=Figure
+controlledvocabulary.astroType.artwork=Illustration
+controlledvocabulary.astroType.animation=Animation
+controlledvocabulary.astroType.prettypicture=Image dcorative
+controlledvocabulary.astroType.documentation=Documentation
+controlledvocabulary.astroType.other=Autre
+controlledvocabulary.astroType.library=Bibliothque
+controlledvocabulary.astroType.press_release=Communiqu
+controlledvocabulary.astroType.facsimile=Tlcopie
+controlledvocabulary.astroType.historical=Historique
+controlledvocabulary.astroType.observation=Observation
+controlledvocabulary.astroType.object=Objet
+controlledvocabulary.astroType.value=Valeur
+controlledvocabulary.astroType.valuepair=Couple de valeur
+controlledvocabulary.astroType.survey=Enqute
\ No newline at end of file
diff --git a/src/main/java/biomedical.properties b/src/main/java/biomedical.properties
new file mode 100644
index 00000000000..c3fd3f81bc7
--- /dev/null
+++ b/src/main/java/biomedical.properties
@@ -0,0 +1,311 @@
+metadatablock.name=biomedical
+metadatablock.displayName=Life Sciences Metadata
+datasetfieldtype.studyDesignType.title=Design Type
+datasetfieldtype.studyFactorType.title=Factor Type
+datasetfieldtype.studyAssayOrganism.title=Organism
+datasetfieldtype.studyAssayOtherOrganism.title=Other Organism
+datasetfieldtype.studyAssayMeasurementType.title=Measurement Type
+datasetfieldtype.studyAssayOtherMeasurmentType.title=Other Measurement Type
+datasetfieldtype.studyAssayTechnologyType.title=Technology Type
+datasetfieldtype.studyAssayPlatform.title=Technology Platform
+datasetfieldtype.studyAssayCellType.title=Cell Type
+datasetfieldtype.studyDesignType.description=Design types that are based on the overall experimental design.
+datasetfieldtype.studyFactorType.description=Factors used in the Dataset.
+datasetfieldtype.studyAssayOrganism.description=The taxonomic name of the organism used in the Dataset or from which the  starting biological material derives.
+datasetfieldtype.studyAssayOtherOrganism.description=If Other was selected in Organism, list any other organisms that were used in this Dataset. Terms from the NCBI Taxonomy are recommended.
+datasetfieldtype.studyAssayMeasurementType.description=A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification).
+datasetfieldtype.studyAssayOtherMeasurmentType.description=If Other was selected in Measurement Type, list any other measurement types that were used. Terms from NCBO Bioportal are recommended.
+datasetfieldtype.studyAssayTechnologyType.description=A term to identify the technology used to perform the measurement (e.g. DNA microarray; mass spectrometry).
+datasetfieldtype.studyAssayPlatform.description=The manufacturer and name of the technology platform used in the assay (e.g. Bruker AVANCE).
+datasetfieldtype.studyAssayCellType.description=The name of the cell line from which the source or sample derives.
+datasetfieldtype.studyDesignType.watermark=
+datasetfieldtype.studyFactorType.watermark=
+datasetfieldtype.studyAssayOrganism.watermark=
+datasetfieldtype.studyAssayOtherOrganism.watermark=
+datasetfieldtype.studyAssayMeasurementType.watermark=
+datasetfieldtype.studyAssayOtherMeasurmentType.watermark=
+datasetfieldtype.studyAssayTechnologyType.watermark=
+datasetfieldtype.studyAssayPlatform.watermark=
+datasetfieldtype.studyAssayCellType.watermark=
+controlledvocabulary.studyDesignType.case_control=Case Control
+controlledvocabulary.studyDesignType.cross_sectional=Cross Sectional
+controlledvocabulary.studyDesignType.cohort_study=Cohort Study
+controlledvocabulary.studyDesignType.nested_case_control_design=Nested Case Control Design
+controlledvocabulary.studyDesignType.not_specified=Not Specified
+controlledvocabulary.studyDesignType.parallel_group_design=Parallel Group Design
+controlledvocabulary.studyDesignType.perturbation_design=Perturbation Design
+controlledvocabulary.studyDesignType.randomized_controlled_trial=Randomized Controlled Trial
+controlledvocabulary.studyDesignType.technological_design=Technological Design
+controlledvocabulary.studyFactorType.age=Age
+controlledvocabulary.studyFactorType.biomarkers=Biomarkers
+controlledvocabulary.studyFactorType.cell_surface_markers=Cell Surface Markers
+controlledvocabulary.studyFactorType.cell_type/cell_line=Cell Type/Cell Line
+controlledvocabulary.studyFactorType.developmental_stage=Developmental Stage
+controlledvocabulary.studyFactorType.disease_state=Disease State
+controlledvocabulary.studyFactorType.drug_susceptibility=Drug Susceptibility
+controlledvocabulary.studyFactorType.extract_molecule=Extract Molecule
+controlledvocabulary.studyFactorType.genetic_characteristics=Genetic Characteristics
+controlledvocabulary.studyFactorType.immunoprecipitation_antibody=Immunoprecipitation Antibody
+controlledvocabulary.studyFactorType.organism=Organism
+controlledvocabulary.studyFactorType.other=Other
+controlledvocabulary.studyFactorType.passages=Passages
+controlledvocabulary.studyFactorType.platform=Platform
+controlledvocabulary.studyFactorType.sex=Sex
+controlledvocabulary.studyFactorType.strain=Strain
+controlledvocabulary.studyFactorType.time_point=Time Point
+controlledvocabulary.studyFactorType.tissue_type=Tissue Type
+controlledvocabulary.studyFactorType.treatment_compound=Treatment Compound
+controlledvocabulary.studyFactorType.treatment_type=Treatment Type
+controlledvocabulary.studyAssayMeasurementType.cell_counting=cell counting
+controlledvocabulary.studyAssayMeasurementType.cell_sorting=cell sorting
+controlledvocabulary.studyAssayMeasurementType.clinical_chemistry_analysis=clinical chemistry analysis
+controlledvocabulary.studyAssayMeasurementType.copy_number_variation_profiling=copy number variation profiling
+controlledvocabulary.studyAssayMeasurementType.dna_methylation_profiling=DNA methylation profiling
+controlledvocabulary.studyAssayMeasurementType.dna_methylation_profiling_(bisulfite-seq)=DNA methylation profiling (Bisulfite-Seq)
+controlledvocabulary.studyAssayMeasurementType.dna_methylation_profiling_(medip-seq)=DNA methylation profiling (MeDIP-Seq)
+controlledvocabulary.studyAssayMeasurementType.drug_susceptibility=drug susceptibility
+controlledvocabulary.studyAssayMeasurementType.environmental_gene_survey=environmental gene survey
+controlledvocabulary.studyAssayMeasurementType.genome_sequencing=genome sequencing
+controlledvocabulary.studyAssayMeasurementType.hematology=hematology
+controlledvocabulary.studyAssayMeasurementType.histology=histology
+controlledvocabulary.studyAssayMeasurementType.histone_modification_(chip-seq)=Histone Modification (ChIP-Seq)
+controlledvocabulary.studyAssayMeasurementType.loss_of_heterozygosity_profiling=loss of heterozygosity profiling
+controlledvocabulary.studyAssayMeasurementType.metabolite_profiling=metabolite profiling
+controlledvocabulary.studyAssayMeasurementType.metagenome_sequencing=metagenome sequencing
+controlledvocabulary.studyAssayMeasurementType.protein_expression_profiling=protein expression profiling
+controlledvocabulary.studyAssayMeasurementType.protein_identification=protein identification
+controlledvocabulary.studyAssayMeasurementType.protein-dna_binding_site_identification=protein-DNA binding site identification
+controlledvocabulary.studyAssayMeasurementType.protein-protein_interaction_detection=protein-protein interaction detection
+controlledvocabulary.studyAssayMeasurementType.protein-rna_binding_(rip-seq)=protein-RNA binding (RIP-Seq)
+controlledvocabulary.studyAssayMeasurementType.snp_analysis=SNP analysis
+controlledvocabulary.studyAssayMeasurementType.targeted_sequencing=targeted sequencing
+controlledvocabulary.studyAssayMeasurementType.transcription_factor_binding_(chip-seq)=transcription factor binding (ChIP-Seq)
+controlledvocabulary.studyAssayMeasurementType.transcription_factor_binding_site_identification=transcription factor binding site identification
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling=transcription profiling
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling=transcription profiling
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling_(microarray)=transcription profiling (Microarray)
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling_(rna-seq)=transcription profiling (RNA-Seq)
+controlledvocabulary.studyAssayMeasurementType.trap_translational_profiling=TRAP translational profiling
+controlledvocabulary.studyAssayMeasurementType.other=Other
+controlledvocabulary.studyAssayOrganism.arabidopsis_thaliana=Arabidopsis thaliana
+controlledvocabulary.studyAssayOrganism.bos_taurus=Bos taurus
+controlledvocabulary.studyAssayOrganism.caenorhabditis_elegans=Caenorhabditis elegans
+controlledvocabulary.studyAssayOrganism.chlamydomonas_reinhardtii=Chlamydomonas reinhardtii
+controlledvocabulary.studyAssayOrganism.danio_rerio_(zebrafish)=Danio rerio (zebrafish)
+controlledvocabulary.studyAssayOrganism.dictyostelium_discoideum=Dictyostelium discoideum
+controlledvocabulary.studyAssayOrganism.drosophila_melanogaster=Drosophila melanogaster
+controlledvocabulary.studyAssayOrganism.escherichia_coli=Escherichia coli
+controlledvocabulary.studyAssayOrganism.hepatitis_c_virus=Hepatitis C virus
+controlledvocabulary.studyAssayOrganism.homo_sapiens=Homo sapiens
+controlledvocabulary.studyAssayOrganism.mus_musculus=Mus musculus
+controlledvocabulary.studyAssayOrganism.mycobacterium_africanum=Mycobacterium africanum
+controlledvocabulary.studyAssayOrganism.mycobacterium_canetti=Mycobacterium canetti
+controlledvocabulary.studyAssayOrganism.mycobacterium_tuberculosis=Mycobacterium tuberculosis
+controlledvocabulary.studyAssayOrganism.mycoplasma_pneumoniae=Mycoplasma pneumoniae
+controlledvocabulary.studyAssayOrganism.oryza_sativa=Oryza sativa
+controlledvocabulary.studyAssayOrganism.plasmodium_falciparum=Plasmodium falciparum
+controlledvocabulary.studyAssayOrganism.pneumocystis_carinii=Pneumocystis carinii
+controlledvocabulary.studyAssayOrganism.rattus_norvegicus=Rattus norvegicus
+controlledvocabulary.studyAssayOrganism.saccharomyces_cerevisiae_(brewer's_yeast)=Saccharomyces cerevisiae (brewer's yeast)
+controlledvocabulary.studyAssayOrganism.schizosaccharomyces_pombe=Schizosaccharomyces pombe
+controlledvocabulary.studyAssayOrganism.takifugu_rubripes=Takifugu rubripes
+controlledvocabulary.studyAssayOrganism.xenopus_laevis=Xenopus laevis
+controlledvocabulary.studyAssayOrganism.zea_mays=Zea mays
+controlledvocabulary.studyAssayOrganism.other=Other
+controlledvocabulary.studyAssayTechnologyType.culture_based_drug_susceptibility_testing,_single_concentration=culture based drug susceptibility testing, single concentration
+controlledvocabulary.studyAssayTechnologyType.culture_based_drug_susceptibility_testing,_two_concentrations=culture based drug susceptibility testing, two concentrations
+controlledvocabulary.studyAssayTechnologyType.culture_based_drug_susceptibility_testing,_three_or_more_concentrations_(minimium_inhibitory_concentration_measurement)=culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)
+controlledvocabulary.studyAssayTechnologyType.dna_microarray=DNA microarray
+controlledvocabulary.studyAssayTechnologyType.flow_cytometry=flow cytometry
+controlledvocabulary.studyAssayTechnologyType.gel_electrophoresis=gel electrophoresis
+controlledvocabulary.studyAssayTechnologyType.mass_spectrometry=mass spectrometry
+controlledvocabulary.studyAssayTechnologyType.nmr_spectroscopy=NMR spectroscopy
+controlledvocabulary.studyAssayTechnologyType.nucleotide_sequencing=nucleotide sequencing
+controlledvocabulary.studyAssayTechnologyType.protein_microarray=protein microarray
+controlledvocabulary.studyAssayTechnologyType.real_time_pcr=real time PCR
+controlledvocabulary.studyAssayTechnologyType.no_technology_required=no technology required
+controlledvocabulary.studyAssayTechnologyType.other=Other
+controlledvocabulary.studyAssayPlatform.210-ms_gc_ion_trap_(varian)=210-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.220-ms_gc_ion_trap_(varian)=220-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.225-ms_gc_ion_trap_(varian)=225-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.240-ms_gc_ion_trap_(varian)=240-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.300-ms_quadrupole_gc/ms_(varian)=300-MS quadrupole GC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.320-ms_lc/ms_(varian)=320-MS LC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.325-ms_lc/ms_(varian)=325-MS LC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.320-ms_gc/ms_(varian)=320-MS GC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.500-ms_lc/ms_(varian)=500-MS LC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.800d_(jeol)=800D (Jeol)
+controlledvocabulary.studyAssayPlatform.910-ms_tq-ft_(varian)=910-MS TQ-FT (Varian)
+controlledvocabulary.studyAssayPlatform.920-ms_tq-ft_(varian)=920-MS TQ-FT (Varian)
+controlledvocabulary.studyAssayPlatform.3100_mass_detector_(waters)=3100 Mass Detector (Waters)
+controlledvocabulary.studyAssayPlatform.6110_quadrupole_lc/ms_(agilent)=6110 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6120_quadrupole_lc/ms_(agilent)=6120 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6130_quadrupole_lc/ms_(agilent)=6130 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6140_quadrupole_lc/ms_(agilent)=6140 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6310_ion_trap_lc/ms_(agilent)=6310 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6320_ion_trap_lc/ms_(agilent)=6320 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6330_ion_trap_lc/ms_(agilent)=6330 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6340_ion_trap_lc/ms_(agilent)=6340 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6410_triple_quadrupole_lc/ms_(agilent)=6410 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6430_triple_quadrupole_lc/ms_(agilent)=6430 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6460_triple_quadrupole_lc/ms_(agilent)=6460 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6490_triple_quadrupole_lc/ms_(agilent)=6490 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6530_q-tof_lc/ms_(agilent)=6530 Q-TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6540_q-tof_lc/ms_(agilent)=6540 Q-TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6210_tof_lc/ms_(agilent)=6210 TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6220_tof_lc/ms_(agilent)=6220 TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6230_tof_lc/ms_(agilent)=6230 TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.7000b_triple_quadrupole_gc/ms_(agilent)=7000B Triple Quadrupole GC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.accuto_dart_(jeol)=AccuTO DART (Jeol)
+controlledvocabulary.studyAssayPlatform.accutof_gc_(jeol)=AccuTOF GC (Jeol)
+controlledvocabulary.studyAssayPlatform.accutof_lc_(jeol)=AccuTOF LC (Jeol)
+controlledvocabulary.studyAssayPlatform.acquity_sqd_(waters)=ACQUITY SQD (Waters)
+controlledvocabulary.studyAssayPlatform.acquity_tqd_(waters)=ACQUITY TQD (Waters)
+controlledvocabulary.studyAssayPlatform.agilent=Agilent
+controlledvocabulary.studyAssayPlatform.agilent_5975e_gc/msd_(agilent)=Agilent 5975E GC/MSD (Agilent)
+controlledvocabulary.studyAssayPlatform.agilent_5975t_ltm_gc/msd_(agilent)=Agilent 5975T LTM GC/MSD (Agilent)
+controlledvocabulary.studyAssayPlatform.5975c_series_gc/msd_(agilent)=5975C Series GC/MSD (Agilent)
+controlledvocabulary.studyAssayPlatform.affymetrix=Affymetrix
+controlledvocabulary.studyAssayPlatform.amazon_etd_esi_ion_trap_(bruker)=amaZon ETD ESI Ion Trap (Bruker)
+controlledvocabulary.studyAssayPlatform.amazon_x_esi_ion_trap_(bruker)=amaZon X ESI Ion Trap (Bruker)
+controlledvocabulary.studyAssayPlatform.apex-ultra_hybrid_qq-ftms_(bruker)=apex-ultra hybrid Qq-FTMS (Bruker)
+controlledvocabulary.studyAssayPlatform.api_2000_(ab_sciex)=API 2000 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_3200_(ab_sciex)=API 3200 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_3200_qtrap_(ab_sciex)=API 3200 QTRAP (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_4000_(ab_sciex)=API 4000 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_4000_qtrap_(ab_sciex)=API 4000 QTRAP (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_5000_(ab_sciex)=API 5000 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_5500_(ab_sciex)=API 5500 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_5500_qtrap_(ab_sciex)=API 5500 QTRAP (AB Sciex)
+controlledvocabulary.studyAssayPlatform.applied_biosystems_group_(abi)=Applied Biosystems Group (ABI)
+controlledvocabulary.studyAssayPlatform.aqi_biosciences=AQI Biosciences
+controlledvocabulary.studyAssayPlatform.atmospheric_pressure_gc_(waters)=Atmospheric Pressure GC (Waters)
+controlledvocabulary.studyAssayPlatform.autoflex_iii_maldi-tof_ms_(bruker)=autoflex III MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.autoflex_speed(bruker)=autoflex speed(Bruker)
+controlledvocabulary.studyAssayPlatform.autospec_premier_(waters)=AutoSpec Premier (Waters)
+controlledvocabulary.studyAssayPlatform.axima_mega_tof_(shimadzu)=AXIMA Mega TOF (Shimadzu)
+controlledvocabulary.studyAssayPlatform.axima_performance_maldi_tof/tof_(shimadzu)=AXIMA Performance MALDI TOF/TOF (Shimadzu)
+controlledvocabulary.studyAssayPlatform.a-10_analyzer_(apogee)=A-10 Analyzer (Apogee)
+controlledvocabulary.studyAssayPlatform.a-40-minifcm_(apogee)=A-40-MiniFCM (Apogee)
+controlledvocabulary.studyAssayPlatform.bactiflow_(chemunex_sa)=Bactiflow (Chemunex SA)
+controlledvocabulary.studyAssayPlatform.base4innovation=Base4innovation
+controlledvocabulary.studyAssayPlatform.bd_bactec_mgit_320=BD BACTEC MGIT 320
+controlledvocabulary.studyAssayPlatform.bd_bactec_mgit_960=BD BACTEC MGIT 960
+controlledvocabulary.studyAssayPlatform.bd_radiometric_bactec_460tb=BD Radiometric BACTEC 460TB
+controlledvocabulary.studyAssayPlatform.bionanomatrix=BioNanomatrix
+controlledvocabulary.studyAssayPlatform.cell_lab_quanta_sc_(becman_coulter)=Cell Lab Quanta SC (Becman Coulter)
+controlledvocabulary.studyAssayPlatform.clarus_560_d_gc/ms_(perkinelmer)=Clarus 560 D GC/MS (PerkinElmer)
+controlledvocabulary.studyAssayPlatform.clarus_560_s_gc/ms_(perkinelmer)=Clarus 560 S GC/MS (PerkinElmer)
+controlledvocabulary.studyAssayPlatform.clarus_600_gc/ms_(perkinelmer)=Clarus 600 GC/MS (PerkinElmer)
+controlledvocabulary.studyAssayPlatform.complete_genomics=Complete Genomics
+controlledvocabulary.studyAssayPlatform.cyan_(dako_cytomation)=Cyan (Dako Cytomation)
+controlledvocabulary.studyAssayPlatform.cyflow_ml_(partec)=CyFlow ML (Partec)
+controlledvocabulary.studyAssayPlatform.cyow_sl_(partec)=Cyow SL (Partec)
+controlledvocabulary.studyAssayPlatform.cyflow_sl3_(partec)=CyFlow SL3 (Partec)
+controlledvocabulary.studyAssayPlatform.cytobuoy_(cyto_buoy_inc)=CytoBuoy (Cyto Buoy Inc)
+controlledvocabulary.studyAssayPlatform.cytosence_(cyto_buoy_inc)=CytoSence (Cyto Buoy Inc)
+controlledvocabulary.studyAssayPlatform.cytosub_(cyto_buoy_inc)=CytoSub (Cyto Buoy Inc)
+controlledvocabulary.studyAssayPlatform.danaher=Danaher
+controlledvocabulary.studyAssayPlatform.dfs_(thermo_scientific)=DFS (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.exactive(thermo_scientific)=Exactive(Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.facs_canto_(becton_dickinson)=FACS Canto (Becton Dickinson)
+controlledvocabulary.studyAssayPlatform.facs_canto2_(becton_dickinson)=FACS Canto2 (Becton Dickinson)
+controlledvocabulary.studyAssayPlatform.facs_scan_(becton_dickinson)=FACS Scan (Becton Dickinson)
+controlledvocabulary.studyAssayPlatform.fc_500_(becman_coulter)=FC 500 (Becman Coulter)
+controlledvocabulary.studyAssayPlatform.gcmate_ii_gc/ms_(jeol)=GCmate II GC/MS (Jeol)
+controlledvocabulary.studyAssayPlatform.gcms-qp2010_plus_(shimadzu)=GCMS-QP2010 Plus (Shimadzu)
+controlledvocabulary.studyAssayPlatform.gcms-qp2010s_plus_(shimadzu)=GCMS-QP2010S Plus (Shimadzu)
+controlledvocabulary.studyAssayPlatform.gct_premier_(waters)=GCT Premier (Waters)
+controlledvocabulary.studyAssayPlatform.geneq=GENEQ
+controlledvocabulary.studyAssayPlatform.genome_corp.=Genome Corp.
+controlledvocabulary.studyAssayPlatform.genovoxx=GenoVoxx
+controlledvocabulary.studyAssayPlatform.gnubio=GnuBio
+controlledvocabulary.studyAssayPlatform.guava_easycyte_mini_(millipore)=Guava EasyCyte Mini (Millipore)
+controlledvocabulary.studyAssayPlatform.guava_easycyte_plus_(millipore)=Guava EasyCyte Plus (Millipore)
+controlledvocabulary.studyAssayPlatform.guava_personal_cell_analysis_(millipore)=Guava Personal Cell Analysis (Millipore)
+controlledvocabulary.studyAssayPlatform.guava_personal_cell_analysis-96_(millipore)=Guava Personal Cell Analysis-96 (Millipore)
+controlledvocabulary.studyAssayPlatform.helicos_biosciences=Helicos BioSciences
+controlledvocabulary.studyAssayPlatform.illumina=Illumina
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_lj_medium=Indirect proportion method on LJ medium
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_middlebrook_agar_7h9=Indirect proportion method on Middlebrook Agar 7H9
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_middlebrook_agar_7h10=Indirect proportion method on Middlebrook Agar 7H10
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_middlebrook_agar_7h11=Indirect proportion method on Middlebrook Agar 7H11
+controlledvocabulary.studyAssayPlatform.influx_analyzer_(cytopeia)=inFlux Analyzer (Cytopeia)
+controlledvocabulary.studyAssayPlatform.intelligent_bio-systems=Intelligent Bio-Systems
+controlledvocabulary.studyAssayPlatform.itq_700_(thermo_scientific)=ITQ 700 (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.itq_900_(thermo_scientific)=ITQ 900 (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.itq_1100_(thermo_scientific)=ITQ 1100 (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.jms-53000_spiraltof_(jeol)=JMS-53000 SpiralTOF (Jeol)
+controlledvocabulary.studyAssayPlatform.lasergen=LaserGen
+controlledvocabulary.studyAssayPlatform.lcms-2020_(shimadzu)=LCMS-2020 (Shimadzu)
+controlledvocabulary.studyAssayPlatform.lcms-2010ev_(shimadzu)=LCMS-2010EV (Shimadzu)
+controlledvocabulary.studyAssayPlatform.lcms-it-tof_(shimadzu)=LCMS-IT-TOF (Shimadzu)
+controlledvocabulary.studyAssayPlatform.li-cor=Li-Cor
+controlledvocabulary.studyAssayPlatform.life_tech=Life Tech
+controlledvocabulary.studyAssayPlatform.lightspeed_genomics=LightSpeed Genomics
+controlledvocabulary.studyAssayPlatform.lct_premier_xe_(waters)=LCT Premier XE (Waters)
+controlledvocabulary.studyAssayPlatform.lcq_deca_xp_max_(thermo_scientific)=LCQ Deca XP MAX (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.lcq_fleet_(thermo_scientific)=LCQ Fleet (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.lxq_(thermo_scientific)=LXQ (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_classic_(thermo_scientific)=LTQ Classic (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_xl_(thermo_scientific)=LTQ XL (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_velos_(thermo_scientific)=LTQ Velos (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_classic_(thermo_scientific)=LTQ Orbitrap Classic (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_xl_(thermo_scientific)=LTQ Orbitrap XL (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_discovery_(thermo_scientific)=LTQ Orbitrap Discovery (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_velos_(thermo_scientific)=LTQ Orbitrap Velos (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.luminex_100_(luminex)=Luminex 100 (Luminex)
+controlledvocabulary.studyAssayPlatform.luminex_200_(luminex)=Luminex 200 (Luminex)
+controlledvocabulary.studyAssayPlatform.macs_quant_(miltenyi)=MACS Quant (Miltenyi)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_g2_hdms_(waters)=MALDI SYNAPT G2 HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_g2_ms_(waters)=MALDI SYNAPT G2 MS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_hdms_(waters)=MALDI SYNAPT HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_ms_(waters)=MALDI SYNAPT MS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_micro_mx_(waters)=MALDI micro MX (Waters)
+controlledvocabulary.studyAssayPlatform.maxis_(bruker)=maXis (Bruker)
+controlledvocabulary.studyAssayPlatform.maxis_g4_(bruker)=maXis G4 (Bruker)
+controlledvocabulary.studyAssayPlatform.microflex_lt_maldi-tof_ms_(bruker)=microflex LT MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.microflex_lrf_maldi-tof_ms_(bruker)=microflex LRF MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.microflex_iii_maldi-tof_ms_(bruker)=microflex III MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.microtof_ii_esi_tof_(bruker)=micrOTOF II ESI TOF (Bruker)
+controlledvocabulary.studyAssayPlatform.microtof-q_ii_esi-qq-tof_(bruker)=micrOTOF-Q II ESI-Qq-TOF (Bruker)
+controlledvocabulary.studyAssayPlatform.microplate_alamar_blue_(resazurin)_colorimetric_method=microplate Alamar Blue (resazurin) colorimetric method
+controlledvocabulary.studyAssayPlatform.mstation_(jeol)=Mstation (Jeol)
+controlledvocabulary.studyAssayPlatform.msq_plus_(thermo_scientific)=MSQ Plus (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.nabsys=NABsys
+controlledvocabulary.studyAssayPlatform.nanophotonics_biosciences=Nanophotonics Biosciences
+controlledvocabulary.studyAssayPlatform.network_biosystems=Network Biosystems
+controlledvocabulary.studyAssayPlatform.nimblegen=Nimblegen
+controlledvocabulary.studyAssayPlatform.oxford_nanopore_technologies=Oxford Nanopore Technologies
+controlledvocabulary.studyAssayPlatform.pacific_biosciences=Pacific Biosciences
+controlledvocabulary.studyAssayPlatform.population_genetics_technologies=Population Genetics Technologies
+controlledvocabulary.studyAssayPlatform.q1000gc_ultraquad_(jeol)=Q1000GC UltraQuad (Jeol)
+controlledvocabulary.studyAssayPlatform.quattro_micro_api_(waters)=Quattro micro API (Waters)
+controlledvocabulary.studyAssayPlatform.quattro_micro_gc_(waters)=Quattro micro GC (Waters)
+controlledvocabulary.studyAssayPlatform.quattro_premier_xe_(waters)=Quattro Premier XE (Waters)
+controlledvocabulary.studyAssayPlatform.qstar_(ab_sciex)=QSTAR (AB Sciex)
+controlledvocabulary.studyAssayPlatform.reveo=Reveo
+controlledvocabulary.studyAssayPlatform.roche=Roche
+controlledvocabulary.studyAssayPlatform.seirad=Seirad
+controlledvocabulary.studyAssayPlatform.solarix_hybrid_qq-ftms_(bruker)=solariX hybrid Qq-FTMS (Bruker)
+controlledvocabulary.studyAssayPlatform.somacount_(bently_instruments)=Somacount (Bently Instruments)
+controlledvocabulary.studyAssayPlatform.somascope_(bently_instruments)=SomaScope (Bently Instruments)
+controlledvocabulary.studyAssayPlatform.synapt_g2_hdms_(waters)=SYNAPT G2 HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.synapt_g2_ms_(waters)=SYNAPT G2 MS (Waters)
+controlledvocabulary.studyAssayPlatform.synapt_hdms_(waters)=SYNAPT HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.synapt_ms_(waters)=SYNAPT MS (Waters)
+controlledvocabulary.studyAssayPlatform.tripletof_5600_(ab_sciex)=TripleTOF 5600 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_ultra_(thermo_scientific)=TSQ Quantum Ultra (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_access_(thermo_scientific)=TSQ Quantum Access (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_access_max_(thermo_scientific)=TSQ Quantum Access MAX (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_discovery_max_(thermo_scientific)=TSQ Quantum Discovery MAX (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_gc_(thermo_scientific)=TSQ Quantum GC (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_xls_(thermo_scientific)=TSQ Quantum XLS (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_vantage_(thermo_scientific)=TSQ Vantage (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ultraflextreme_maldi-tof_ms_(bruker)=ultrafleXtreme MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.visigen_biotechnologies=VisiGen Biotechnologies
+controlledvocabulary.studyAssayPlatform.xevo_g2_qtof_(waters)=Xevo G2 QTOF (Waters)
+controlledvocabulary.studyAssayPlatform.xevo_qtof_ms_(waters)=Xevo QTof MS (Waters)
+controlledvocabulary.studyAssayPlatform.xevo_tq_ms_(waters)=Xevo TQ MS (Waters)
+controlledvocabulary.studyAssayPlatform.xevo_tq-s_(waters)=Xevo TQ-S (Waters)
+controlledvocabulary.studyAssayPlatform.other=Other
\ No newline at end of file
diff --git a/src/main/java/biomedical_fr.properties b/src/main/java/biomedical_fr.properties
new file mode 100644
index 00000000000..0d41f937f0a
--- /dev/null
+++ b/src/main/java/biomedical_fr.properties
@@ -0,0 +1,311 @@
+metadatablock.name=biomedical
+metadatablock.displayName=Mtadonnes lies aux sciences de la vie
+datasetfieldtype.studyDesignType.title=Type de modle
+datasetfieldtype.studyFactorType.title=Type de facteur
+datasetfieldtype.studyAssayOrganism.title=Organisme
+datasetfieldtype.studyAssayOtherOrganism.title=Autre organisme
+datasetfieldtype.studyAssayMeasurementType.title=Type de mesure
+datasetfieldtype.studyAssayOtherMeasurmentType.title=Autre type de mesure
+datasetfieldtype.studyAssayTechnologyType.title=Type de technologie
+datasetfieldtype.studyAssayPlatform.title=Plateforme technologique
+datasetfieldtype.studyAssayCellType.title=Type de cellule
+datasetfieldtype.studyDesignType.description=Types de modle fonds sur le modle exprimental gnral.
+datasetfieldtype.studyFactorType.description=Facteurs utiliss dans l'ensemble de donnes.
+datasetfieldtype.studyAssayOrganism.description=Le nom taxonomique de l'organisme utilis dans l'ensemble de donnes ou duquel le matriel biologique de dpart provient.
+datasetfieldtype.studyAssayOtherOrganism.description=Si \u00A0Autre\u00A0 est slectionn dans \u00A0Organisme\u00A0, lister ici tout autre organisme utilis dans cet ensemble de donnes. L'utilisation des termes provenant de la taxonomie NCBI est recommande.
+datasetfieldtype.studyAssayMeasurementType.description=Un terme pour dfinir le rsultat final ou ce qui est mesur (p.ex. le profilage de l'expression gntique, l'identification des protines).
+datasetfieldtype.studyAssayOtherMeasurmentType.description=Si \u00A0Autre\u00A0 est slectionn dans \u00A0Type de mesure\u00A0, il faut indiquer tous les autres types de mesure utiliss. On recommande d'utiliser les termes du BioPortal NCBO.
+datasetfieldtype.studyAssayTechnologyType.description=Un terme pour indiquer la technologie utilise pour procder  la mesure (p.ex. microrseau  ADN, spectromtrie de masse).
+datasetfieldtype.studyAssayPlatform.description=Le fabricant et le nom de la plateforme technologique utilise dans l'essai (p.ex. AVANCE de Bruker).
+datasetfieldtype.studyAssayCellType.description=Nom de la ligne cellulaire de laquelle provient la source ou l'chantillon.
+datasetfieldtype.studyDesignType.watermark=
+datasetfieldtype.studyFactorType.watermark=
+datasetfieldtype.studyAssayOrganism.watermark=
+datasetfieldtype.studyAssayOtherOrganism.watermark=
+datasetfieldtype.studyAssayMeasurementType.watermark=
+datasetfieldtype.studyAssayOtherMeasurmentType.watermark=
+datasetfieldtype.studyAssayTechnologyType.watermark=
+datasetfieldtype.studyAssayPlatform.watermark=
+datasetfieldtype.studyAssayCellType.watermark=
+controlledvocabulary.studyDesignType.case_control=Cas-tmoin
+controlledvocabulary.studyDesignType.cross_sectional=En coupe
+controlledvocabulary.studyDesignType.cohort_study=tude de cohorte
+controlledvocabulary.studyDesignType.nested_case_control_design=Modle d'tude cas-tmoins imbrique
+controlledvocabulary.studyDesignType.not_specified=Non prcis
+controlledvocabulary.studyDesignType.parallel_group_design=Modle  groupes parallles
+controlledvocabulary.studyDesignType.perturbation_design=Modle des perturbations
+controlledvocabulary.studyDesignType.randomized_controlled_trial=Essai randomis contrl
+controlledvocabulary.studyDesignType.technological_design=Modle technologique
+controlledvocabulary.studyFactorType.age=ge
+controlledvocabulary.studyFactorType.biomarkers=Marqueurs biologiques
+controlledvocabulary.studyFactorType.cell_surface_markers=Marqueurs de surface
+controlledvocabulary.studyFactorType.cell_type/cell_line=Type de cellule/ligne cellulaire
+controlledvocabulary.studyFactorType.developmental_stage=Stade de dveloppement
+controlledvocabulary.studyFactorType.disease_state=tat de la maladie
+controlledvocabulary.studyFactorType.drug_susceptibility=Sensibilit aux mdicaments
+controlledvocabulary.studyFactorType.extract_molecule=Extraire la molcule
+controlledvocabulary.studyFactorType.genetic_characteristics=Caractristiques gntiques
+controlledvocabulary.studyFactorType.immunoprecipitation_antibody=Anticorps d'immunoprcipitation
+controlledvocabulary.studyFactorType.organism=Organisme
+controlledvocabulary.studyFactorType.other=Autre
+controlledvocabulary.studyFactorType.passages=Passages
+controlledvocabulary.studyFactorType.platform=Plateforme
+controlledvocabulary.studyFactorType.sex=Sexe
+controlledvocabulary.studyFactorType.strain=Souche
+controlledvocabulary.studyFactorType.time_point=Point dans le temps
+controlledvocabulary.studyFactorType.tissue_type=Type de tissu
+controlledvocabulary.studyFactorType.treatment_compound=Compos pour le traitement
+controlledvocabulary.studyFactorType.treatment_type=Type de traitement
+controlledvocabulary.studyAssayMeasurementType.cell_counting=Dnombrement cellulaire
+controlledvocabulary.studyAssayMeasurementType.cell_sorting=Tri cellulaire
+controlledvocabulary.studyAssayMeasurementType.clinical_chemistry_analysis=Analyse de la chimie clinique
+controlledvocabulary.studyAssayMeasurementType.copy_number_variation_profiling=Profilage de la variation du nombre de copies
+controlledvocabulary.studyAssayMeasurementType.dna_methylation_profiling=Profilage de la mthylation de l'ADN
+controlledvocabulary.studyAssayMeasurementType.dna_methylation_profiling_(bisulfite-seq)=Profilage de la mthylation de l'ADN (squenage du bisulfite)
+controlledvocabulary.studyAssayMeasurementType.dna_methylation_profiling_(medip-seq)=Profilage de la mthylation de l'ADN (squenage MeDIP)
+controlledvocabulary.studyAssayMeasurementType.drug_susceptibility=drug susceptibility
+controlledvocabulary.studyAssayMeasurementType.environmental_gene_survey=Enqute gnomique environnementale
+controlledvocabulary.studyAssayMeasurementType.genome_sequencing=Squenage gnomique
+controlledvocabulary.studyAssayMeasurementType.hematology=Hmatologie
+controlledvocabulary.studyAssayMeasurementType.histology=Histologie
+controlledvocabulary.studyAssayMeasurementType.histone_modification_(chip-seq)=Modification des histones (squenage ChIP)
+controlledvocabulary.studyAssayMeasurementType.loss_of_heterozygosity_profiling=Profilage de la perte d'htrozygotie
+controlledvocabulary.studyAssayMeasurementType.metabolite_profiling=Profilage des mtabolites
+controlledvocabulary.studyAssayMeasurementType.metagenome_sequencing=Squenage des mtagnomes
+controlledvocabulary.studyAssayMeasurementType.protein_expression_profiling=Profilage de l'expression des protines
+controlledvocabulary.studyAssayMeasurementType.protein_identification=Identification des protines
+controlledvocabulary.studyAssayMeasurementType.protein-dna_binding_site_identification=Identification du site de fixation de la protine-ADN
+controlledvocabulary.studyAssayMeasurementType.protein-protein_interaction_detection=Dtection de l'interaction protine-protine
+controlledvocabulary.studyAssayMeasurementType.protein-rna_binding_(rip-seq)=Fixation de la protine-ARN (squenage RIP)
+controlledvocabulary.studyAssayMeasurementType.snp_analysis=Analyse SNP
+controlledvocabulary.studyAssayMeasurementType.targeted_sequencing=targeted sequencing
+controlledvocabulary.studyAssayMeasurementType.transcription_factor_binding_(chip-seq)=Fixation du facteur de transcription (squenage ChIP)
+controlledvocabulary.studyAssayMeasurementType.transcription_factor_binding_site_identification=Identification du site de fixation du facteur de transcription
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling=Profilage transcriptionnel
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling=Profilage transcriptionnel
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling_(microarray)=Profilage transcriptionnel (microrseau)
+controlledvocabulary.studyAssayMeasurementType.transcription_profiling_(rna-seq)=Profilage transcriptionnel (squenage de l'ARN)
+controlledvocabulary.studyAssayMeasurementType.trap_translational_profiling=Profilage transcriptionnel
+controlledvocabulary.studyAssayMeasurementType.other=Autre
+controlledvocabulary.studyAssayOrganism.arabidopsis_thaliana=Arabidopsis thaliana
+controlledvocabulary.studyAssayOrganism.bos_taurus=Bos taurus
+controlledvocabulary.studyAssayOrganism.caenorhabditis_elegans=Caenorhabditis elegans
+controlledvocabulary.studyAssayOrganism.chlamydomonas_reinhardtii=Chlamydomonas reinhardtii
+controlledvocabulary.studyAssayOrganism.danio_rerio_(zebrafish)=Danio rerio (zebrafish)
+controlledvocabulary.studyAssayOrganism.dictyostelium_discoideum=Dictyostelium discoideum
+controlledvocabulary.studyAssayOrganism.drosophila_melanogaster=Drosophila melanogaster
+controlledvocabulary.studyAssayOrganism.escherichia_coli=Escherichia coli
+controlledvocabulary.studyAssayOrganism.hepatitis_c_virus=Hepatitis C virus
+controlledvocabulary.studyAssayOrganism.homo_sapiens=Homo sapiens
+controlledvocabulary.studyAssayOrganism.mus_musculus=Mus musculus
+controlledvocabulary.studyAssayOrganism.mycobacterium_africanum=Mycobacterium africanum
+controlledvocabulary.studyAssayOrganism.mycobacterium_canetti=Mycobacterium canetti
+controlledvocabulary.studyAssayOrganism.mycobacterium_tuberculosis=Mycobacterium tuberculosis
+controlledvocabulary.studyAssayOrganism.mycoplasma_pneumoniae=Saccharomyces cerevisiae (levure de bire)
+controlledvocabulary.studyAssayOrganism.oryza_sativa=Oryza sativa
+controlledvocabulary.studyAssayOrganism.plasmodium_falciparum=Plasmodium falciparum
+controlledvocabulary.studyAssayOrganism.pneumocystis_carinii=Pneumocystis carinii
+controlledvocabulary.studyAssayOrganism.rattus_norvegicus=Rattus norvegicus
+controlledvocabulary.studyAssayOrganism.saccharomyces_cerevisiae_(brewer's_yeast)=Autre
+controlledvocabulary.studyAssayOrganism.schizosaccharomyces_pombe=Dtermination des squences nuclotidiques
+controlledvocabulary.studyAssayOrganism.takifugu_rubripes=Cytomtrie de flux
+controlledvocabulary.studyAssayOrganism.xenopus_laevis=Microrseau  ADN
+controlledvocabulary.studyAssayOrganism.zea_mays=Spectromtrie de masse
+controlledvocabulary.studyAssayOrganism.other=lectrophorse en gel
+controlledvocabulary.studyAssayTechnologyType.culture_based_drug_susceptibility_testing,_single_concentration=Microrseau de protines
+controlledvocabulary.studyAssayTechnologyType.culture_based_drug_susceptibility_testing,_two_concentrations=PCR en temps rel
+controlledvocabulary.studyAssayTechnologyType.culture_based_drug_susceptibility_testing,_three_or_more_concentrations_(minimium_inhibitory_concentration_measurement)=Spectroscopie RMN
+controlledvocabulary.studyAssayTechnologyType.dna_microarray=Aucune technologie requise
+controlledvocabulary.studyAssayTechnologyType.flow_cytometry=Autre
+controlledvocabulary.studyAssayTechnologyType.gel_electrophoresis=gel electrophoresis
+controlledvocabulary.studyAssayTechnologyType.mass_spectrometry=mass spectrometry
+controlledvocabulary.studyAssayTechnologyType.nmr_spectroscopy=NMR spectroscopy
+controlledvocabulary.studyAssayTechnologyType.nucleotide_sequencing=nucleotide sequencing
+controlledvocabulary.studyAssayTechnologyType.protein_microarray=protein microarray
+controlledvocabulary.studyAssayTechnologyType.real_time_pcr=real time PCR
+controlledvocabulary.studyAssayTechnologyType.no_technology_required=no technology required
+controlledvocabulary.studyAssayTechnologyType.other=Other
+controlledvocabulary.studyAssayPlatform.210-ms_gc_ion_trap_(varian)=210-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.220-ms_gc_ion_trap_(varian)=220-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.225-ms_gc_ion_trap_(varian)=225-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.240-ms_gc_ion_trap_(varian)=240-MS GC Ion Trap (Varian)
+controlledvocabulary.studyAssayPlatform.300-ms_quadrupole_gc/ms_(varian)=300-MS quadrupole GC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.320-ms_lc/ms_(varian)=320-MS LC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.325-ms_lc/ms_(varian)=325-MS LC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.320-ms_gc/ms_(varian)=320-MS GC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.500-ms_lc/ms_(varian)=500-MS LC/MS (Varian)
+controlledvocabulary.studyAssayPlatform.800d_(jeol)=800D (Jeol)
+controlledvocabulary.studyAssayPlatform.910-ms_tq-ft_(varian)=910-MS TQ-FT (Varian)
+controlledvocabulary.studyAssayPlatform.920-ms_tq-ft_(varian)=920-MS TQ-FT (Varian)
+controlledvocabulary.studyAssayPlatform.3100_mass_detector_(waters)=3100 Mass Detector (Waters)
+controlledvocabulary.studyAssayPlatform.6110_quadrupole_lc/ms_(agilent)=6110 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6120_quadrupole_lc/ms_(agilent)=6120 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6130_quadrupole_lc/ms_(agilent)=6130 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6140_quadrupole_lc/ms_(agilent)=6140 Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6310_ion_trap_lc/ms_(agilent)=6310 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6320_ion_trap_lc/ms_(agilent)=6320 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6330_ion_trap_lc/ms_(agilent)=6330 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6340_ion_trap_lc/ms_(agilent)=6340 Ion Trap LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6410_triple_quadrupole_lc/ms_(agilent)=6410 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6430_triple_quadrupole_lc/ms_(agilent)=6430 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6460_triple_quadrupole_lc/ms_(agilent)=6460 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6490_triple_quadrupole_lc/ms_(agilent)=6490 Triple Quadrupole LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6530_q-tof_lc/ms_(agilent)=6530 Q-TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6540_q-tof_lc/ms_(agilent)=6540 Q-TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6210_tof_lc/ms_(agilent)=6210 TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6220_tof_lc/ms_(agilent)=6220 TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.6230_tof_lc/ms_(agilent)=6230 TOF LC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.7000b_triple_quadrupole_gc/ms_(agilent)=7000B Triple Quadrupole GC/MS (Agilent)
+controlledvocabulary.studyAssayPlatform.accuto_dart_(jeol)=AccuTO DART (Jeol)
+controlledvocabulary.studyAssayPlatform.accutof_gc_(jeol)=AccuTOF GC (Jeol)
+controlledvocabulary.studyAssayPlatform.accutof_lc_(jeol)=AccuTOF LC (Jeol)
+controlledvocabulary.studyAssayPlatform.acquity_sqd_(waters)=ACQUITY SQD (Waters)
+controlledvocabulary.studyAssayPlatform.acquity_tqd_(waters)=ACQUITY TQD (Waters)
+controlledvocabulary.studyAssayPlatform.agilent=Agilent
+controlledvocabulary.studyAssayPlatform.agilent_5975e_gc/msd_(agilent)=Agilent 5975E GC/MSD (Agilent)
+controlledvocabulary.studyAssayPlatform.agilent_5975t_ltm_gc/msd_(agilent)=Agilent 5975T LTM GC/MSD (Agilent)
+controlledvocabulary.studyAssayPlatform.5975c_series_gc/msd_(agilent)=5975C Series GC/MSD (Agilent)
+controlledvocabulary.studyAssayPlatform.affymetrix=Affymetrix
+controlledvocabulary.studyAssayPlatform.amazon_etd_esi_ion_trap_(bruker)=amaZon ETD ESI Ion Trap (Bruker)
+controlledvocabulary.studyAssayPlatform.amazon_x_esi_ion_trap_(bruker)=amaZon X ESI Ion Trap (Bruker)
+controlledvocabulary.studyAssayPlatform.apex-ultra_hybrid_qq-ftms_(bruker)=apex-ultra hybrid Qq-FTMS (Bruker)
+controlledvocabulary.studyAssayPlatform.api_2000_(ab_sciex)=API 2000 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_3200_(ab_sciex)=API 3200 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_3200_qtrap_(ab_sciex)=API 3200 QTRAP (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_4000_(ab_sciex)=API 4000 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_4000_qtrap_(ab_sciex)=API 4000 QTRAP (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_5000_(ab_sciex)=API 5000 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_5500_(ab_sciex)=API 5500 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.api_5500_qtrap_(ab_sciex)=API 5500 QTRAP (AB Sciex)
+controlledvocabulary.studyAssayPlatform.applied_biosystems_group_(abi)=Applied Biosystems Group (ABI)
+controlledvocabulary.studyAssayPlatform.aqi_biosciences=AQI Biosciences
+controlledvocabulary.studyAssayPlatform.atmospheric_pressure_gc_(waters)=Atmospheric Pressure GC (Waters)
+controlledvocabulary.studyAssayPlatform.autoflex_iii_maldi-tof_ms_(bruker)=autoflex III MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.autoflex_speed(bruker)=autoflex speed(Bruker)
+controlledvocabulary.studyAssayPlatform.autospec_premier_(waters)=AutoSpec Premier (Waters)
+controlledvocabulary.studyAssayPlatform.axima_mega_tof_(shimadzu)=AXIMA Mega TOF (Shimadzu)
+controlledvocabulary.studyAssayPlatform.axima_performance_maldi_tof/tof_(shimadzu)=AXIMA Performance MALDI TOF/TOF (Shimadzu)
+controlledvocabulary.studyAssayPlatform.a-10_analyzer_(apogee)=A-10 Analyzer (Apogee)
+controlledvocabulary.studyAssayPlatform.a-40-minifcm_(apogee)=A-40-MiniFCM (Apogee)
+controlledvocabulary.studyAssayPlatform.bactiflow_(chemunex_sa)=Bactiflow (Chemunex SA)
+controlledvocabulary.studyAssayPlatform.base4innovation=Base4innovation
+controlledvocabulary.studyAssayPlatform.bd_bactec_mgit_320=BD BACTEC MGIT 320
+controlledvocabulary.studyAssayPlatform.bd_bactec_mgit_960=BD BACTEC MGIT 960
+controlledvocabulary.studyAssayPlatform.bd_radiometric_bactec_460tb=BD Radiometric BACTEC 460TB
+controlledvocabulary.studyAssayPlatform.bionanomatrix=BioNanomatrix
+controlledvocabulary.studyAssayPlatform.cell_lab_quanta_sc_(becman_coulter)=Cell Lab Quanta SC (Becman Coulter)
+controlledvocabulary.studyAssayPlatform.clarus_560_d_gc/ms_(perkinelmer)=Clarus 560 D GC/MS (PerkinElmer)
+controlledvocabulary.studyAssayPlatform.clarus_560_s_gc/ms_(perkinelmer)=Clarus 560 S GC/MS (PerkinElmer)
+controlledvocabulary.studyAssayPlatform.clarus_600_gc/ms_(perkinelmer)=Clarus 600 GC/MS (PerkinElmer)
+controlledvocabulary.studyAssayPlatform.complete_genomics=Complete Genomics
+controlledvocabulary.studyAssayPlatform.cyan_(dako_cytomation)=Cyan (Dako Cytomation)
+controlledvocabulary.studyAssayPlatform.cyflow_ml_(partec)=CyFlow ML (Partec)
+controlledvocabulary.studyAssayPlatform.cyow_sl_(partec)=Cyow SL (Partec)
+controlledvocabulary.studyAssayPlatform.cyflow_sl3_(partec)=CyFlow SL3 (Partec)
+controlledvocabulary.studyAssayPlatform.cytobuoy_(cyto_buoy_inc)=CytoBuoy (Cyto Buoy Inc)
+controlledvocabulary.studyAssayPlatform.cytosence_(cyto_buoy_inc)=CytoSence (Cyto Buoy Inc)
+controlledvocabulary.studyAssayPlatform.cytosub_(cyto_buoy_inc)=CytoSub (Cyto Buoy Inc)
+controlledvocabulary.studyAssayPlatform.danaher=Danaher
+controlledvocabulary.studyAssayPlatform.dfs_(thermo_scientific)=DFS (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.exactive(thermo_scientific)=Exactive(Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.facs_canto_(becton_dickinson)=FACS Canto (Becton Dickinson)
+controlledvocabulary.studyAssayPlatform.facs_canto2_(becton_dickinson)=FACS Canto2 (Becton Dickinson)
+controlledvocabulary.studyAssayPlatform.facs_scan_(becton_dickinson)=FACS Scan (Becton Dickinson)
+controlledvocabulary.studyAssayPlatform.fc_500_(becman_coulter)=FC 500 (Becman Coulter)
+controlledvocabulary.studyAssayPlatform.gcmate_ii_gc/ms_(jeol)=GCmate II GC/MS (Jeol)
+controlledvocabulary.studyAssayPlatform.gcms-qp2010_plus_(shimadzu)=GCMS-QP2010 Plus (Shimadzu)
+controlledvocabulary.studyAssayPlatform.gcms-qp2010s_plus_(shimadzu)=GCMS-QP2010S Plus (Shimadzu)
+controlledvocabulary.studyAssayPlatform.gct_premier_(waters)=GCT Premier (Waters)
+controlledvocabulary.studyAssayPlatform.geneq=GENEQ
+controlledvocabulary.studyAssayPlatform.genome_corp.=Genome Corp.
+controlledvocabulary.studyAssayPlatform.genovoxx=GenoVoxx
+controlledvocabulary.studyAssayPlatform.gnubio=GnuBio
+controlledvocabulary.studyAssayPlatform.guava_easycyte_mini_(millipore)=Guava EasyCyte Mini (Millipore)
+controlledvocabulary.studyAssayPlatform.guava_easycyte_plus_(millipore)=Guava EasyCyte Plus (Millipore)
+controlledvocabulary.studyAssayPlatform.guava_personal_cell_analysis_(millipore)=Guava Personal Cell Analysis (Millipore)
+controlledvocabulary.studyAssayPlatform.guava_personal_cell_analysis-96_(millipore)=Guava Personal Cell Analysis-96 (Millipore)
+controlledvocabulary.studyAssayPlatform.helicos_biosciences=Helicos BioSciences
+controlledvocabulary.studyAssayPlatform.illumina=Illumina
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_lj_medium=Indirect proportion method on LJ medium
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_middlebrook_agar_7h9=Indirect proportion method on Middlebrook Agar 7H9
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_middlebrook_agar_7h10=Indirect proportion method on Middlebrook Agar 7H10
+controlledvocabulary.studyAssayPlatform.indirect_proportion_method_on_middlebrook_agar_7h11=Indirect proportion method on Middlebrook Agar 7H11
+controlledvocabulary.studyAssayPlatform.influx_analyzer_(cytopeia)=inFlux Analyzer (Cytopeia)
+controlledvocabulary.studyAssayPlatform.intelligent_bio-systems=Intelligent Bio-Systems
+controlledvocabulary.studyAssayPlatform.itq_700_(thermo_scientific)=ITQ 700 (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.itq_900_(thermo_scientific)=ITQ 900 (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.itq_1100_(thermo_scientific)=ITQ 1100 (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.jms-53000_spiraltof_(jeol)=JMS-53000 SpiralTOF (Jeol)
+controlledvocabulary.studyAssayPlatform.lasergen=LaserGen
+controlledvocabulary.studyAssayPlatform.lcms-2020_(shimadzu)=LCMS-2020 (Shimadzu)
+controlledvocabulary.studyAssayPlatform.lcms-2010ev_(shimadzu)=LCMS-2010EV (Shimadzu)
+controlledvocabulary.studyAssayPlatform.lcms-it-tof_(shimadzu)=LCMS-IT-TOF (Shimadzu)
+controlledvocabulary.studyAssayPlatform.li-cor=Li-Cor
+controlledvocabulary.studyAssayPlatform.life_tech=Life Tech
+controlledvocabulary.studyAssayPlatform.lightspeed_genomics=LightSpeed Genomics
+controlledvocabulary.studyAssayPlatform.lct_premier_xe_(waters)=LCT Premier XE (Waters)
+controlledvocabulary.studyAssayPlatform.lcq_deca_xp_max_(thermo_scientific)=LCQ Deca XP MAX (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.lcq_fleet_(thermo_scientific)=LCQ Fleet (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.lxq_(thermo_scientific)=LXQ (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_classic_(thermo_scientific)=LTQ Classic (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_xl_(thermo_scientific)=LTQ XL (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_velos_(thermo_scientific)=LTQ Velos (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_classic_(thermo_scientific)=LTQ Orbitrap Classic (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_xl_(thermo_scientific)=LTQ Orbitrap XL (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_discovery_(thermo_scientific)=LTQ Orbitrap Discovery (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ltq_orbitrap_velos_(thermo_scientific)=LTQ Orbitrap Velos (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.luminex_100_(luminex)=Luminex 100 (Luminex)
+controlledvocabulary.studyAssayPlatform.luminex_200_(luminex)=Luminex 200 (Luminex)
+controlledvocabulary.studyAssayPlatform.macs_quant_(miltenyi)=MACS Quant (Miltenyi)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_g2_hdms_(waters)=MALDI SYNAPT G2 HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_g2_ms_(waters)=MALDI SYNAPT G2 MS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_hdms_(waters)=MALDI SYNAPT HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_synapt_ms_(waters)=MALDI SYNAPT MS (Waters)
+controlledvocabulary.studyAssayPlatform.maldi_micro_mx_(waters)=MALDI micro MX (Waters)
+controlledvocabulary.studyAssayPlatform.maxis_(bruker)=maXis (Bruker)
+controlledvocabulary.studyAssayPlatform.maxis_g4_(bruker)=maXis G4 (Bruker)
+controlledvocabulary.studyAssayPlatform.microflex_lt_maldi-tof_ms_(bruker)=microflex LT MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.microflex_lrf_maldi-tof_ms_(bruker)=microflex LRF MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.microflex_iii_maldi-tof_ms_(bruker)=microflex III MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.microtof_ii_esi_tof_(bruker)=micrOTOF II ESI TOF (Bruker)
+controlledvocabulary.studyAssayPlatform.microtof-q_ii_esi-qq-tof_(bruker)=micrOTOF-Q II ESI-Qq-TOF (Bruker)
+controlledvocabulary.studyAssayPlatform.microplate_alamar_blue_(resazurin)_colorimetric_method=microplate Alamar Blue (resazurin) colorimetric method
+controlledvocabulary.studyAssayPlatform.mstation_(jeol)=Mstation (Jeol)
+controlledvocabulary.studyAssayPlatform.msq_plus_(thermo_scientific)=MSQ Plus (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.nabsys=NABsys
+controlledvocabulary.studyAssayPlatform.nanophotonics_biosciences=Nanophotonics Biosciences
+controlledvocabulary.studyAssayPlatform.network_biosystems=Network Biosystems
+controlledvocabulary.studyAssayPlatform.nimblegen=Nimblegen
+controlledvocabulary.studyAssayPlatform.oxford_nanopore_technologies=Oxford Nanopore Technologies
+controlledvocabulary.studyAssayPlatform.pacific_biosciences=Pacific Biosciences
+controlledvocabulary.studyAssayPlatform.population_genetics_technologies=Population Genetics Technologies
+controlledvocabulary.studyAssayPlatform.q1000gc_ultraquad_(jeol)=Q1000GC UltraQuad (Jeol)
+controlledvocabulary.studyAssayPlatform.quattro_micro_api_(waters)=Quattro micro API (Waters)
+controlledvocabulary.studyAssayPlatform.quattro_micro_gc_(waters)=Quattro micro GC (Waters)
+controlledvocabulary.studyAssayPlatform.quattro_premier_xe_(waters)=Quattro Premier XE (Waters)
+controlledvocabulary.studyAssayPlatform.qstar_(ab_sciex)=QSTAR (AB Sciex)
+controlledvocabulary.studyAssayPlatform.reveo=Reveo
+controlledvocabulary.studyAssayPlatform.roche=Roche
+controlledvocabulary.studyAssayPlatform.seirad=Seirad
+controlledvocabulary.studyAssayPlatform.solarix_hybrid_qq-ftms_(bruker)=solariX hybrid Qq-FTMS (Bruker)
+controlledvocabulary.studyAssayPlatform.somacount_(bently_instruments)=Somacount (Bently Instruments)
+controlledvocabulary.studyAssayPlatform.somascope_(bently_instruments)=SomaScope (Bently Instruments)
+controlledvocabulary.studyAssayPlatform.synapt_g2_hdms_(waters)=SYNAPT G2 HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.synapt_g2_ms_(waters)=SYNAPT G2 MS (Waters)
+controlledvocabulary.studyAssayPlatform.synapt_hdms_(waters)=SYNAPT HDMS (Waters)
+controlledvocabulary.studyAssayPlatform.synapt_ms_(waters)=SYNAPT MS (Waters)
+controlledvocabulary.studyAssayPlatform.tripletof_5600_(ab_sciex)=TripleTOF 5600 (AB Sciex)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_ultra_(thermo_scientific)=TSQ Quantum Ultra (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_access_(thermo_scientific)=TSQ Quantum Access (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_access_max_(thermo_scientific)=TSQ Quantum Access MAX (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_discovery_max_(thermo_scientific)=TSQ Quantum Discovery MAX (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_gc_(thermo_scientific)=TSQ Quantum GC (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_quantum_xls_(thermo_scientific)=TSQ Quantum XLS (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.tsq_vantage_(thermo_scientific)=TSQ Vantage (Thermo Scientific)
+controlledvocabulary.studyAssayPlatform.ultraflextreme_maldi-tof_ms_(bruker)=ultrafleXtreme MALDI-TOF MS (Bruker)
+controlledvocabulary.studyAssayPlatform.visigen_biotechnologies=VisiGen Biotechnologies
+controlledvocabulary.studyAssayPlatform.xevo_g2_qtof_(waters)=Xevo G2 QTOF (Waters)
+controlledvocabulary.studyAssayPlatform.xevo_qtof_ms_(waters)=Xevo QTof MS (Waters)
+controlledvocabulary.studyAssayPlatform.xevo_tq_ms_(waters)=Xevo TQ MS (Waters)
+controlledvocabulary.studyAssayPlatform.xevo_tq-s_(waters)=Xevo TQ-S (Waters)
+controlledvocabulary.studyAssayPlatform.other=Other
\ No newline at end of file
diff --git a/src/main/java/citation.properties b/src/main/java/citation.properties
new file mode 100644
index 00000000000..8f3d8b109f2
--- /dev/null
+++ b/src/main/java/citation.properties
@@ -0,0 +1,475 @@
+metadatablock.name=citation
+metadatablock.displayName=Citation Metadata
+datasetfieldtype.title.title=Title
+datasetfieldtype.subtitle.title=Subtitle
+datasetfieldtype.alternativeTitle.title=Alternative Title
+datasetfieldtype.alternativeURL.title=Alternative URL
+datasetfieldtype.otherId.title=Other ID
+datasetfieldtype.otherIdAgency.title=Agency
+datasetfieldtype.otherIdValue.title=Identifier
+datasetfieldtype.author.title=Author
+datasetfieldtype.authorName.title=Name
+datasetfieldtype.authorAffiliation.title=Affiliation
+datasetfieldtype.authorIdentifierScheme.title=Identifier Scheme
+datasetfieldtype.authorIdentifier.title=Identifier
+datasetfieldtype.datasetContact.title=Contact
+datasetfieldtype.datasetContactName.title=Name
+datasetfieldtype.datasetContactAffiliation.title=Affiliation
+datasetfieldtype.datasetContactEmail.title=E-mail
+datasetfieldtype.dsDescription.title=Description
+datasetfieldtype.dsDescriptionValue.title=Text
+datasetfieldtype.dsDescriptionDate.title=Date
+datasetfieldtype.subject.title=Subject
+datasetfieldtype.keyword.title=Keyword
+datasetfieldtype.keywordValue.title=Term
+datasetfieldtype.keywordVocabulary.title=Vocabulary
+datasetfieldtype.keywordVocabularyURI.title=Vocabulary URL
+datasetfieldtype.topicClassification.title=Topic Classification
+datasetfieldtype.topicClassValue.title=Term
+datasetfieldtype.topicClassVocab.title=Vocabulary
+datasetfieldtype.topicClassVocabURI.title=Vocabulary URL
+datasetfieldtype.publication.title=Related Publication
+datasetfieldtype.publicationCitation.title=Citation
+datasetfieldtype.publicationIDType.title=ID Type
+datasetfieldtype.publicationIDNumber.title=ID Number
+datasetfieldtype.publicationURL.title=URL
+datasetfieldtype.notesText.title=Notes
+datasetfieldtype.language.title=Language
+datasetfieldtype.producer.title=Producer
+datasetfieldtype.producerName.title=Name
+datasetfieldtype.producerAffiliation.title=Affiliation
+datasetfieldtype.producerAbbreviation.title=Abbreviation
+datasetfieldtype.producerURL.title=URL
+datasetfieldtype.producerLogoURL.title=Logo URL
+datasetfieldtype.productionDate.title=Production Date
+datasetfieldtype.productionPlace.title=Production Place
+datasetfieldtype.contributor.title=Contributor
+datasetfieldtype.contributorType.title=Type
+datasetfieldtype.contributorName.title=Name
+datasetfieldtype.grantNumber.title=Grant Information
+datasetfieldtype.grantNumberAgency.title=Grant Agency
+datasetfieldtype.grantNumberValue.title=Grant Number
+datasetfieldtype.distributor.title=Distributor
+datasetfieldtype.distributorName.title=Name
+datasetfieldtype.distributorAffiliation.title=Affiliation
+datasetfieldtype.distributorAbbreviation.title=Abbreviation
+datasetfieldtype.distributorURL.title=URL
+datasetfieldtype.distributorLogoURL.title=Logo URL
+datasetfieldtype.distributionDate.title=Distribution Date
+datasetfieldtype.depositor.title=Depositor
+datasetfieldtype.dateOfDeposit.title=Deposit Date
+datasetfieldtype.timePeriodCovered.title=Time Period Covered
+datasetfieldtype.timePeriodCoveredStart.title=Start
+datasetfieldtype.timePeriodCoveredEnd.title=End
+datasetfieldtype.dateOfCollection.title=Date of Collection
+datasetfieldtype.dateOfCollectionStart.title=Start
+datasetfieldtype.dateOfCollectionEnd.title=End
+datasetfieldtype.kindOfData.title=Kind of Data
+datasetfieldtype.series.title=Series
+datasetfieldtype.seriesName.title=Name
+datasetfieldtype.seriesInformation.title=Information
+datasetfieldtype.software.title=Software
+datasetfieldtype.softwareName.title=Name
+datasetfieldtype.softwareVersion.title=Version
+datasetfieldtype.relatedMaterial.title=Related Material
+datasetfieldtype.relatedDatasets.title=Related Datasets
+datasetfieldtype.otherReferences.title=Other References
+datasetfieldtype.dataSources.title=Data Sources
+datasetfieldtype.originOfSources.title=Origin of Sources
+datasetfieldtype.characteristicOfSources.title=Characteristic of Sources Noted
+datasetfieldtype.accessToSources.title=Documentation and Access to Sources
+datasetfieldtype.title.description=Full title by which the Dataset is known.
+datasetfieldtype.subtitle.description=A secondary title used to amplify or state certain limitations on the main title.
+datasetfieldtype.alternativeTitle.description=A title by which the work is commonly referred, or an abbreviation of the title.
+datasetfieldtype.alternativeURL.description=A URL where the dataset can be viewed, such as a personal or project website.
+datasetfieldtype.otherId.description=Another unique identifier that identifies this Dataset (e.g., producer's or another repository's number).
+datasetfieldtype.otherIdAgency.description=Name of agency which generated this identifier.
+datasetfieldtype.otherIdValue.description=Other identifier that corresponds to this Dataset.
+datasetfieldtype.author.description=The person(s), corporate body(ies), or agency(ies) responsible for creating the work.
+datasetfieldtype.authorName.description=The author's Family Name, Given Name or the name of the organization responsible for this Dataset.
+datasetfieldtype.authorAffiliation.description=The organization with which the author is affiliated.
+datasetfieldtype.authorIdentifierScheme.description=Name of the identifier scheme (ORCID, ISNI).
+datasetfieldtype.authorIdentifier.description=Uniquely identifies an individual author or organization, according to various schemes.
+datasetfieldtype.datasetContact.description=The contact(s) for this Dataset.
+datasetfieldtype.datasetContactName.description=The contact's Family Name, Given Name or the name of the organization.
+datasetfieldtype.datasetContactAffiliation.description=The organization with which the contact is affiliated.
+datasetfieldtype.datasetContactEmail.description=The e-mail address(es) of the contact(s) for the Dataset. This will not be displayed.
+datasetfieldtype.dsDescription.description=A summary describing the purpose, nature, and scope of the Dataset.
+datasetfieldtype.dsDescriptionValue.description=A summary describing the purpose, nature, and scope of the Dataset.
+datasetfieldtype.dsDescriptionDate.description=In cases where a Dataset contains more than one description (for example, one might be supplied by the data producer and another prepared by the data repository where the data are deposited), the date attribute is used to distinguish between the two descriptions. The date attribute follows the ISO convention of YYYY-MM-DD.
+datasetfieldtype.subject.description=Domain-specific Subject Categories that are topically relevant to the Dataset.
+datasetfieldtype.keyword.description=Key terms that describe important aspects of the Dataset.
+datasetfieldtype.keywordValue.description=Key terms that describe important aspects of the Dataset. Can be used for building keyword indexes and for classification and retrieval purposes. A controlled vocabulary can be employed. The vocab attribute is provided for specification of the controlled vocabulary in use, such as LCSH, MeSH, or others. The vocabURI attribute specifies the location for the full controlled vocabulary.
+datasetfieldtype.keywordVocabulary.description=For the specification of the keyword controlled vocabulary in use, such as LCSH, MeSH, or others.
+datasetfieldtype.keywordVocabularyURI.description=Keyword vocabulary URL points to the web presence that describes the keyword vocabulary, if appropriate. Enter an absolute URL where the keyword vocabulary web site is found, such as http://www.my.org.
+datasetfieldtype.topicClassification.description=The classification field indicates the broad important topic(s) and subjects that the data cover. Library of Congress subject terms may be used here.
+datasetfieldtype.topicClassValue.description=Topic or Subject term that is relevant to this Dataset.
+datasetfieldtype.topicClassVocab.description=Provided for specification of the controlled vocabulary in use, e.g., LCSH, MeSH, etc.
+datasetfieldtype.topicClassVocabURI.description=Specifies the URL location for the full controlled vocabulary.
+datasetfieldtype.publication.description=Publications that use the data from this Dataset.
+datasetfieldtype.publicationCitation.description=The full bibliographic citation for this related publication.
+datasetfieldtype.publicationIDType.description=The type of digital identifier used for this publication (e.g., Digital Object Identifier (DOI)).
+datasetfieldtype.publicationIDNumber.description=The identifier for the selected ID type.
+datasetfieldtype.publicationURL.description=Link to the publication web page (e.g., journal article page, archive record page, or other).
+datasetfieldtype.notesText.description=Additional important information about the Dataset.
+datasetfieldtype.language.description=Language of the Dataset
+datasetfieldtype.producer.description=Person or organization with the financial or administrative responsibility over this Dataset
+datasetfieldtype.producerName.description=Producer name
+datasetfieldtype.producerAffiliation.description=The organization with which the producer is affiliated.
+datasetfieldtype.producerAbbreviation.description=The abbreviation by which the producer is commonly known. (ex. IQSS, ICPSR)
+datasetfieldtype.producerURL.description=Producer URL points to the producer's web presence, if appropriate. Enter an absolute URL where the producer's web site is found, such as http://www.my.org.
+datasetfieldtype.producerLogoURL.description=URL for the producer's logo, which points to this  producer's web-accessible logo image. Enter an absolute URL where the producer's logo image is found, such as http://www.my.org/images/logo.gif.
+datasetfieldtype.productionDate.description=Date when the data collection or other materials were produced (not distributed, published or archived).
+datasetfieldtype.productionPlace.description=The location where the data collection and any other related materials were produced.
+datasetfieldtype.contributor.description=The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource.
+datasetfieldtype.contributorType.description=The type of contributor of the  resource.
+datasetfieldtype.contributorName.description=The Family Name, Given Name or organization name of the contributor.
+datasetfieldtype.grantNumber.description=Grant Information
+datasetfieldtype.grantNumberAgency.description=Grant Number Agency
+datasetfieldtype.grantNumberValue.description=The grant or contract number of the project that  sponsored the effort.
+datasetfieldtype.distributor.description=The organization designated by the author or producer to generate copies of the particular work including any necessary editions or revisions.
+datasetfieldtype.distributorName.description=Distributor name
+datasetfieldtype.distributorAffiliation.description=The organization with which the distributor contact is affiliated.
+datasetfieldtype.distributorAbbreviation.description=The abbreviation by which this distributor is commonly known (e.g., IQSS, ICPSR).
+datasetfieldtype.distributorURL.description=Distributor URL points to the distributor's web presence, if appropriate. Enter an absolute URL where the distributor's web site is found, such as http://www.my.org.
+datasetfieldtype.distributorLogoURL.description=URL of the distributor's logo, which points to this  distributor's web-accessible logo image. Enter an absolute URL where the distributor's logo image is found, such as http://www.my.org/images/logo.gif.
+datasetfieldtype.distributionDate.description=Date that the work was made available for distribution/presentation.
+datasetfieldtype.depositor.description=The person (Family Name, Given Name) or the name of the organization that deposited this Dataset to the repository.
+datasetfieldtype.dateOfDeposit.description=Date that the Dataset was deposited into the repository.
+datasetfieldtype.timePeriodCovered.description=Time period to which the data refer. This item reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected. Also known as span.
+datasetfieldtype.timePeriodCoveredStart.description=Start date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.
+datasetfieldtype.timePeriodCoveredEnd.description=End date which reflects the time period covered by the data, not the dates of coding or making documents machine-readable or the dates the data were collected.
+datasetfieldtype.dateOfCollection.description=Contains the date(s) when the data were collected.
+datasetfieldtype.dateOfCollectionStart.description=Date when the data collection started.
+datasetfieldtype.dateOfCollectionEnd.description=Date when the data collection ended.
+datasetfieldtype.kindOfData.description=Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other.
+datasetfieldtype.series.description=Information about the Dataset series.
+datasetfieldtype.seriesName.description=Name of the dataset series to which the Dataset belongs.
+datasetfieldtype.seriesInformation.description=History of the series and summary of those features that apply to the series as a whole.
+datasetfieldtype.software.description=Information about the software used to generate the Dataset.
+datasetfieldtype.softwareName.description=Name of software used to generate the Dataset.
+datasetfieldtype.softwareVersion.description=Version of the software used to generate the Dataset.
+datasetfieldtype.relatedMaterial.description=Any material related to this Dataset.
+datasetfieldtype.relatedDatasets.description=Any Datasets that are related to this Dataset, such as previous research on this subject.
+datasetfieldtype.otherReferences.description=Any references that would serve as background or supporting material to this Dataset.
+datasetfieldtype.dataSources.description=List of books, articles, serials, or machine-readable data files that served as the sources of the data collection.
+datasetfieldtype.originOfSources.description=For historical materials, information about the origin of the sources and the rules followed in establishing the sources should be specified.
+datasetfieldtype.characteristicOfSources.description=Assessment of characteristics and source material.
+datasetfieldtype.accessToSources.description=Level of documentation of the original sources.
+datasetfieldtype.title.watermark=Enter title...
+datasetfieldtype.subtitle.watermark=
+datasetfieldtype.alternativeTitle.watermark=
+datasetfieldtype.alternativeURL.watermark=Enter full URL, starting with http://
+datasetfieldtype.otherId.watermark=
+datasetfieldtype.otherIdAgency.watermark=
+datasetfieldtype.otherIdValue.watermark=
+datasetfieldtype.author.watermark=
+datasetfieldtype.authorName.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.authorAffiliation.watermark=
+datasetfieldtype.authorIdentifierScheme.watermark=
+datasetfieldtype.authorIdentifier.watermark=
+datasetfieldtype.datasetContact.watermark=
+datasetfieldtype.datasetContactName.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.datasetContactAffiliation.watermark=
+datasetfieldtype.datasetContactEmail.watermark=
+datasetfieldtype.dsDescription.watermark=
+datasetfieldtype.dsDescriptionValue.watermark=
+datasetfieldtype.dsDescriptionDate.watermark=YYYY-MM-DD
+datasetfieldtype.subject.watermark=
+datasetfieldtype.keyword.watermark=
+datasetfieldtype.keywordValue.watermark=
+datasetfieldtype.keywordVocabulary.watermark=
+datasetfieldtype.keywordVocabularyURI.watermark=Enter full URL, starting with http://
+datasetfieldtype.topicClassification.watermark=
+datasetfieldtype.topicClassValue.watermark=
+datasetfieldtype.topicClassVocab.watermark=
+datasetfieldtype.topicClassVocabURI.watermark=Enter full URL, starting with http://
+datasetfieldtype.publication.watermark=
+datasetfieldtype.publicationCitation.watermark=
+datasetfieldtype.publicationIDType.watermark=
+datasetfieldtype.publicationIDNumber.watermark=
+datasetfieldtype.publicationURL.watermark=Enter full URL, starting with http://
+datasetfieldtype.notesText.watermark=
+datasetfieldtype.language.watermark=
+datasetfieldtype.producer.watermark=
+datasetfieldtype.producerName.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.producerAffiliation.watermark=
+datasetfieldtype.producerAbbreviation.watermark=
+datasetfieldtype.producerURL.watermark=Enter full URL, starting with http://
+datasetfieldtype.producerLogoURL.watermark=Enter full URL for image, starting with http://
+datasetfieldtype.productionDate.watermark=YYYY-MM-DD
+datasetfieldtype.productionPlace.watermark=
+datasetfieldtype.contributor.watermark=
+datasetfieldtype.contributorType.watermark=
+datasetfieldtype.contributorName.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.grantNumber.watermark=
+datasetfieldtype.grantNumberAgency.watermark=
+datasetfieldtype.grantNumberValue.watermark=
+datasetfieldtype.distributor.watermark=
+datasetfieldtype.distributorName.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.distributorAffiliation.watermark=
+datasetfieldtype.distributorAbbreviation.watermark=
+datasetfieldtype.distributorURL.watermark=Enter full URL, starting with http://
+datasetfieldtype.distributorLogoURL.watermark=Enter full URL for image, starting with http://
+datasetfieldtype.distributionDate.watermark=YYYY-MM-DD
+datasetfieldtype.depositor.watermark=
+datasetfieldtype.dateOfDeposit.watermark=YYYY-MM-DD
+datasetfieldtype.timePeriodCovered.watermark=
+datasetfieldtype.timePeriodCoveredStart.watermark=YYYY-MM-DD
+datasetfieldtype.timePeriodCoveredEnd.watermark=YYYY-MM-DD
+datasetfieldtype.dateOfCollection.watermark=
+datasetfieldtype.dateOfCollectionStart.watermark=YYYY-MM-DD
+datasetfieldtype.dateOfCollectionEnd.watermark=YYYY-MM-DD
+datasetfieldtype.kindOfData.watermark=
+datasetfieldtype.series.watermark=
+datasetfieldtype.seriesName.watermark=
+datasetfieldtype.seriesInformation.watermark=
+datasetfieldtype.software.watermark=
+datasetfieldtype.softwareName.watermark=
+datasetfieldtype.softwareVersion.watermark=
+datasetfieldtype.relatedMaterial.watermark=
+datasetfieldtype.relatedDatasets.watermark=
+datasetfieldtype.otherReferences.watermark=
+datasetfieldtype.dataSources.watermark=
+datasetfieldtype.originOfSources.watermark=
+datasetfieldtype.characteristicOfSources.watermark=
+datasetfieldtype.accessToSources.watermark=
+controlledvocabulary.subject.agricultural_sciences=Agricultural Sciences
+controlledvocabulary.subject.arts_and_humanities=Arts and Humanities
+controlledvocabulary.subject.astronomy_and_astrophysics=Astronomy and Astrophysics
+controlledvocabulary.subject.business_and_management=Business and Management
+controlledvocabulary.subject.chemistry=Chemistry
+controlledvocabulary.subject.computer_and_information_science=Computer and Information Science
+controlledvocabulary.subject.earth_and_environmental_sciences=Earth and Environmental Sciences
+controlledvocabulary.subject.engineering=Engineering
+controlledvocabulary.subject.law=Law
+controlledvocabulary.subject.mathematical_sciences=Mathematical Sciences
+controlledvocabulary.subject.medicine,_health_and_life_sciences=Medicine, Health and Life Sciences
+controlledvocabulary.subject.physics=Physics
+controlledvocabulary.subject.social_sciences=Social Sciences
+controlledvocabulary.subject.other=Other
+controlledvocabulary.publicationIDType.ark=ark
+controlledvocabulary.publicationIDType.arxiv=arXiv
+controlledvocabulary.publicationIDType.bibcode=bibcode
+controlledvocabulary.publicationIDType.doi=doi
+controlledvocabulary.publicationIDType.ean13=ean13
+controlledvocabulary.publicationIDType.eissn=eissn
+controlledvocabulary.publicationIDType.handle=handle
+controlledvocabulary.publicationIDType.isbn=isbn
+controlledvocabulary.publicationIDType.issn=issn
+controlledvocabulary.publicationIDType.istc=istc
+controlledvocabulary.publicationIDType.lissn=lissn
+controlledvocabulary.publicationIDType.lsid=lsid
+controlledvocabulary.publicationIDType.pmid=pmid
+controlledvocabulary.publicationIDType.purl=purl
+controlledvocabulary.publicationIDType.upc=upc
+controlledvocabulary.publicationIDType.url=url
+controlledvocabulary.publicationIDType.urn=urn
+controlledvocabulary.contributorType.data_collector=Data Collector
+controlledvocabulary.contributorType.data_curator=Data Curator
+controlledvocabulary.contributorType.data_manager=Data Manager
+controlledvocabulary.contributorType.editor=Editor
+controlledvocabulary.contributorType.funder=Funder
+controlledvocabulary.contributorType.hosting_institution=Hosting Institution
+controlledvocabulary.contributorType.project_leader=Project Leader
+controlledvocabulary.contributorType.project_manager=Project Manager
+controlledvocabulary.contributorType.project_member=Project Member
+controlledvocabulary.contributorType.related_person=Related Person
+controlledvocabulary.contributorType.researcher=Researcher
+controlledvocabulary.contributorType.research_group=Research Group
+controlledvocabulary.contributorType.rights_holder=Rights Holder
+controlledvocabulary.contributorType.sponsor=Sponsor
+controlledvocabulary.contributorType.supervisor=Supervisor
+controlledvocabulary.contributorType.work_package_leader=Work Package Leader
+controlledvocabulary.contributorType.other=Other
+controlledvocabulary.authorIdentifierScheme.orcid=ORCID
+controlledvocabulary.authorIdentifierScheme.isni=ISNI
+controlledvocabulary.authorIdentifierScheme.lcna=LCNA
+controlledvocabulary.authorIdentifierScheme.viaf=VIAF
+controlledvocabulary.authorIdentifierScheme.gnd=GND
+controlledvocabulary.language.abkhaz=Abkhaz
+controlledvocabulary.language.afar=Afar
+controlledvocabulary.language.afrikaans=Afrikaans
+controlledvocabulary.language.akan=Akan
+controlledvocabulary.language.albanian=Albanian
+controlledvocabulary.language.amharic=Amharic
+controlledvocabulary.language.arabic=Arabic
+controlledvocabulary.language.aragonese=Aragonese
+controlledvocabulary.language.armenian=Armenian
+controlledvocabulary.language.assamese=Assamese
+controlledvocabulary.language.avaric=Avaric
+controlledvocabulary.language.avestan=Avestan
+controlledvocabulary.language.aymara=Aymara
+controlledvocabulary.language.azerbaijani=Azerbaijani
+controlledvocabulary.language.bambara=Bambara
+controlledvocabulary.language.bashkir=Bashkir
+controlledvocabulary.language.basque=Basque
+controlledvocabulary.language.belarusian=Belarusian
+controlledvocabulary.language.bengali,_bangla=Bengali, Bangla
+controlledvocabulary.language.bihari=Bihari
+controlledvocabulary.language.bislama=Bislama
+controlledvocabulary.language.bosnian=Bosnian
+controlledvocabulary.language.breton=Breton
+controlledvocabulary.language.bulgarian=Bulgarian
+controlledvocabulary.language.burmese=Burmese
+controlledvocabulary.language.catalan,valencian=Catalan,Valencian
+controlledvocabulary.language.chamorro=Chamorro
+controlledvocabulary.language.chechen=Chechen
+controlledvocabulary.language.chichewa,_chewa,_nyanja=Chichewa, Chewa, Nyanja
+controlledvocabulary.language.chinese=Chinese
+controlledvocabulary.language.chuvash=Chuvash
+controlledvocabulary.language.cornish=Cornish
+controlledvocabulary.language.corsican=Corsican
+controlledvocabulary.language.cree=Cree
+controlledvocabulary.language.croatian=Croatian
+controlledvocabulary.language.czech=Czech
+controlledvocabulary.language.danish=Danish
+controlledvocabulary.language.divehi,_dhivehi,_maldivian=Divehi, Dhivehi, Maldivian
+controlledvocabulary.language.dutch=Dutch
+controlledvocabulary.language.dzongkha=Dzongkha
+controlledvocabulary.language.english=English
+controlledvocabulary.language.esperanto=Esperanto
+controlledvocabulary.language.estonian=Estonian
+controlledvocabulary.language.ewe=Ewe
+controlledvocabulary.language.faroese=Faroese
+controlledvocabulary.language.fijian=Fijian
+controlledvocabulary.language.finnish=Finnish
+controlledvocabulary.language.french=French
+controlledvocabulary.language.fula,_fulah,_pulaar,_pular=Fula, Fulah, Pulaar, Pular
+controlledvocabulary.language.galician=Galician
+controlledvocabulary.language.georgian=Georgian
+controlledvocabulary.language.german=German
+controlledvocabulary.language.greek_(modern)=Greek (modern)
+controlledvocabulary.language.guarani=Guaran
+controlledvocabulary.language.gujarati=Gujarati
+controlledvocabulary.language.haitian,_haitian_creole=Haitian, Haitian Creole
+controlledvocabulary.language.hausa=Hausa
+controlledvocabulary.language.hebrew_(modern)=Hebrew (modern)
+controlledvocabulary.language.herero=Herero
+controlledvocabulary.language.hindi=Hindi
+controlledvocabulary.language.hiri_motu=Hiri Motu
+controlledvocabulary.language.hungarian=Hungarian
+controlledvocabulary.language.interlingua=Interlingua
+controlledvocabulary.language.indonesian=Indonesian
+controlledvocabulary.language.interlingue=Interlingue
+controlledvocabulary.language.irish=Irish
+controlledvocabulary.language.igbo=Igbo
+controlledvocabulary.language.inupiaq=Inupiaq
+controlledvocabulary.language.ido=Ido
+controlledvocabulary.language.icelandic=Icelandic
+controlledvocabulary.language.italian=Italian
+controlledvocabulary.language.inuktitut=Inuktitut
+controlledvocabulary.language.japanese=Japanese
+controlledvocabulary.language.javanese=Javanese
+controlledvocabulary.language.kalaallisut,_greenlandic=Kalaallisut, Greenlandic
+controlledvocabulary.language.kannada=Kannada
+controlledvocabulary.language.kanuri=Kanuri
+controlledvocabulary.language.kashmiri=Kashmiri
+controlledvocabulary.language.kazakh=Kazakh
+controlledvocabulary.language.khmer=Khmer
+controlledvocabulary.language.kikuyu,_gikuyu=Kikuyu, Gikuyu
+controlledvocabulary.language.kinyarwanda=Kinyarwanda
+controlledvocabulary.language.kyrgyz=Kyrgyz
+controlledvocabulary.language.komi=Komi
+controlledvocabulary.language.kongo=Kongo
+controlledvocabulary.language.korean=Korean
+controlledvocabulary.language.kurdish=Kurdish
+controlledvocabulary.language.kwanyama,_kuanyama=Kwanyama, Kuanyama
+controlledvocabulary.language.latin=Latin
+controlledvocabulary.language.luxembourgish,_letzeburgesch=Luxembourgish, Letzeburgesch
+controlledvocabulary.language.ganda=Ganda
+controlledvocabulary.language.limburgish,_limburgan,_limburger=Limburgish, Limburgan, Limburger
+controlledvocabulary.language.lingala=Lingala
+controlledvocabulary.language.lao=Lao
+controlledvocabulary.language.lithuanian=Lithuanian
+controlledvocabulary.language.luba-katanga=Luba-Katanga
+controlledvocabulary.language.latvian=Latvian
+controlledvocabulary.language.manx=Manx
+controlledvocabulary.language.macedonian=Macedonian
+controlledvocabulary.language.malagasy=Malagasy
+controlledvocabulary.language.malay=Malay
+controlledvocabulary.language.malayalam=Malayalam
+controlledvocabulary.language.maltese=Maltese
+controlledvocabulary.language.maori=M\u0101ori
+controlledvocabulary.language.marathi_(marathi)=Marathi (Mar\u0101\u1E6Dh\u012B)
+controlledvocabulary.language.marshallese=Marshallese
+controlledvocabulary.language.mixtepec_mixtec=Mixtepec Mixtec
+controlledvocabulary.language.mongolian=Mongolian
+controlledvocabulary.language.nauru=Nauru
+controlledvocabulary.language.navajo,_navaho=Navajo, Navaho
+controlledvocabulary.language.northern_ndebele=Northern Ndebele
+controlledvocabulary.language.nepali=Nepali
+controlledvocabulary.language.ndonga=Ndonga
+controlledvocabulary.language.norwegian_bokmal=Norwegian Bokml
+controlledvocabulary.language.norwegian_nynorsk=Norwegian Nynorsk
+controlledvocabulary.language.norwegian=Norwegian
+controlledvocabulary.language.nuosu=Nuosu
+controlledvocabulary.language.southern_ndebele=Southern Ndebele
+controlledvocabulary.language.occitan=Occitan
+controlledvocabulary.language.ojibwe,_ojibwa=Ojibwe, Ojibwa
+controlledvocabulary.language.old_church_slavonic,church_slavonic,old_bulgarian=Old Church Slavonic,Church Slavonic,Old Bulgarian
+controlledvocabulary.language.oromo=Oromo
+controlledvocabulary.language.oriya=Oriya
+controlledvocabulary.language.ossetian,_ossetic=Ossetian, Ossetic
+controlledvocabulary.language.panjabi,_punjabi=Panjabi, Punjabi
+controlledvocabulary.language.pali=P\u0101li
+controlledvocabulary.language.persian_(farsi)=Persian (Farsi)
+controlledvocabulary.language.polish=Polish
+controlledvocabulary.language.pashto,_pushto=Pashto, Pushto
+controlledvocabulary.language.portuguese=Portuguese
+controlledvocabulary.language.quechua=Quechua
+controlledvocabulary.language.romansh=Romansh
+controlledvocabulary.language.kirundi=Kirundi
+controlledvocabulary.language.romanian=Romanian
+controlledvocabulary.language.russian=Russian
+controlledvocabulary.language.sanskrit_(samskrta)=Sanskrit (Sa\u1E41sk\u1E5Bta)
+controlledvocabulary.language.sardinian=Sardinian
+controlledvocabulary.language.sindhi=Sindhi
+controlledvocabulary.language.northern_sami=Northern Sami
+controlledvocabulary.language.samoan=Samoan
+controlledvocabulary.language.sango=Sango
+controlledvocabulary.language.serbian=Serbian
+controlledvocabulary.language.scottish_gaelic,_gaelic=Scottish Gaelic, Gaelic
+controlledvocabulary.language.shona=Shona
+controlledvocabulary.language.sinhala,_sinhalese=Sinhala, Sinhalese
+controlledvocabulary.language.slovak=Slovak
+controlledvocabulary.language.slovene=Slovene
+controlledvocabulary.language.somali=Somali
+controlledvocabulary.language.southern_sotho=Southern Sotho
+controlledvocabulary.language.spanish,_castilian=Spanish, Castilian
+controlledvocabulary.language.sundanese=Sundanese
+controlledvocabulary.language.swahili=Swahili
+controlledvocabulary.language.swati=Swati
+controlledvocabulary.language.swedish=Swedish
+controlledvocabulary.language.tamil=Tamil
+controlledvocabulary.language.telugu=Telugu
+controlledvocabulary.language.tajik=Tajik
+controlledvocabulary.language.thai=Thai
+controlledvocabulary.language.tigrinya=Tigrinya
+controlledvocabulary.language.tibetan_standard,_tibetan,_central=Tibetan Standard, Tibetan, Central
+controlledvocabulary.language.turkmen=Turkmen
+controlledvocabulary.language.tagalog=Tagalog
+controlledvocabulary.language.tswana=Tswana
+controlledvocabulary.language.tonga_(tonga_islands)=Tonga (Tonga Islands)
+controlledvocabulary.language.turkish=Turkish
+controlledvocabulary.language.tsonga=Tsonga
+controlledvocabulary.language.tatar=Tatar
+controlledvocabulary.language.twi=Twi
+controlledvocabulary.language.tahitian=Tahitian
+controlledvocabulary.language.uyghur,_uighur=Uyghur, Uighur
+controlledvocabulary.language.ukrainian=Ukrainian
+controlledvocabulary.language.urdu=Urdu
+controlledvocabulary.language.uzbek=Uzbek
+controlledvocabulary.language.venda=Venda
+controlledvocabulary.language.vietnamese=Vietnamese
+controlledvocabulary.language.volapuk=Volapk
+controlledvocabulary.language.walloon=Walloon
+controlledvocabulary.language.welsh=Welsh
+controlledvocabulary.language.wolof=Wolof
+controlledvocabulary.language.western_frisian=Western Frisian
+controlledvocabulary.language.xhosa=Xhosa
+controlledvocabulary.language.yiddish=Yiddish
+controlledvocabulary.language.yoruba=Yoruba
+controlledvocabulary.language.zhuang,_chuang=Zhuang, Chuang
+controlledvocabulary.language.zulu=Zulu
+controlledvocabulary.language.not_applicable=Not applicable
\ No newline at end of file
diff --git a/src/main/java/citation_fr.properties b/src/main/java/citation_fr.properties
new file mode 100644
index 00000000000..bfa135e8bc9
--- /dev/null
+++ b/src/main/java/citation_fr.properties
@@ -0,0 +1,475 @@
+metadatablock.name=citation
+metadatablock.displayName=Mtadonnes de la rfrence bibliographique
+datasetfieldtype.title.title=Titre
+datasetfieldtype.subtitle.title=Sous-titre
+datasetfieldtype.alternativeTitle.title=Autre titre
+datasetfieldtype.alternativeURL.title=Autre URL
+datasetfieldtype.otherId.title=Autre identifiant
+datasetfieldtype.otherIdAgency.title=Organisme
+datasetfieldtype.otherIdValue.title=Identifiant
+datasetfieldtype.author.title=Auteur
+datasetfieldtype.authorName.title=Nom
+datasetfieldtype.authorAffiliation.title=Affiliation
+datasetfieldtype.authorIdentifierScheme.title=Schma de l'identifiant
+datasetfieldtype.authorIdentifier.title=Identifiant
+datasetfieldtype.datasetContact.title=Personne-ressource
+datasetfieldtype.datasetContactName.title=Nom
+datasetfieldtype.datasetContactAffiliation.title=Affiliation
+datasetfieldtype.datasetContactEmail.title=Courriel
+datasetfieldtype.dsDescription.title=Description
+datasetfieldtype.dsDescriptionValue.title=Texte
+datasetfieldtype.dsDescriptionDate.title=Date
+datasetfieldtype.subject.title=Sujet
+datasetfieldtype.keyword.title=Mot-cl
+datasetfieldtype.keywordValue.title=Terme
+datasetfieldtype.keywordVocabulary.title=Vocabulaire
+datasetfieldtype.keywordVocabularyURI.title=Adresse URL du vocabulaire
+datasetfieldtype.topicClassification.title=Classification des sujets
+datasetfieldtype.topicClassValue.title=Terme
+datasetfieldtype.topicClassVocab.title=Vocabulaire
+datasetfieldtype.topicClassVocabURI.title=Adresse URL du vocabulaire
+datasetfieldtype.publication.title=Publication connexe
+datasetfieldtype.publicationCitation.title=Rfrence
+datasetfieldtype.publicationIDType.title=Type d'identifiant
+datasetfieldtype.publicationIDNumber.title=Numro d'identification
+datasetfieldtype.publicationURL.title=Adresse URL
+datasetfieldtype.notesText.title=Remarques
+datasetfieldtype.language.title=Langue
+datasetfieldtype.producer.title=Producteur
+datasetfieldtype.producerName.title=Nom
+datasetfieldtype.producerAffiliation.title=Affiliation
+datasetfieldtype.producerAbbreviation.title=Abrviation
+datasetfieldtype.producerURL.title=Adresse URL
+datasetfieldtype.producerLogoURL.title=Adresse URL du logo
+datasetfieldtype.productionDate.title=Date de production
+datasetfieldtype.productionPlace.title=Endroit de production
+datasetfieldtype.contributor.title=Collaborateur
+datasetfieldtype.contributorType.title=Type
+datasetfieldtype.contributorName.title=Nom
+datasetfieldtype.grantNumber.title=Renseignements sur la subvention
+datasetfieldtype.grantNumberAgency.title=Organisme subventionnaire
+datasetfieldtype.grantNumberValue.title=Numro de la subvention
+datasetfieldtype.distributor.title=Diffuseur
+datasetfieldtype.distributorName.title=Nom
+datasetfieldtype.distributorAffiliation.title=Affiliation
+datasetfieldtype.distributorAbbreviation.title=Abrviation
+datasetfieldtype.distributorURL.title=Adresse URL  
+datasetfieldtype.distributorLogoURL.title=Adresse URL du logo
+datasetfieldtype.distributionDate.title=Date de disponibilit
+datasetfieldtype.depositor.title=Dposant
+datasetfieldtype.dateOfDeposit.title=Date de dpt
+datasetfieldtype.timePeriodCovered.title=Priode couverte
+datasetfieldtype.timePeriodCoveredStart.title=Dbut
+datasetfieldtype.timePeriodCoveredEnd.title=Fin
+datasetfieldtype.dateOfCollection.title=Date de la collecte
+datasetfieldtype.dateOfCollectionStart.title=Dbut
+datasetfieldtype.dateOfCollectionEnd.title=Fin
+datasetfieldtype.kindOfData.title=Type de donnes
+datasetfieldtype.series.title=Srie
+datasetfieldtype.seriesName.title=Nom
+datasetfieldtype.seriesInformation.title=Renseignements
+datasetfieldtype.software.title=Logiciel
+datasetfieldtype.softwareName.title=Nom
+datasetfieldtype.softwareVersion.title=Version
+datasetfieldtype.relatedMaterial.title=Document connexe
+datasetfieldtype.relatedDatasets.title=Ensembles de donnes connexes
+datasetfieldtype.otherReferences.title=Autres rfrences
+datasetfieldtype.dataSources.title=Sources de donnes
+datasetfieldtype.originOfSources.title=Origine des sources
+datasetfieldtype.characteristicOfSources.title=Caractristiques des sources notes
+datasetfieldtype.accessToSources.title=Documentation et accs aux sources
+datasetfieldtype.title.description=Titre complet sous lequel l'ensemble de donnes est connu.
+datasetfieldtype.subtitle.description=Un titre secondaire utilis pour amplifier ou noncer certaines limites du titre principal.
+datasetfieldtype.alternativeTitle.description=Un titre sous lequel le travail est communment appel ou une abrviation du titre.
+datasetfieldtype.alternativeURL.description=Une adresse URL o l'ensemble de donnes peut tre consult, tel un site web personnel ou de projet.  
+datasetfieldtype.otherId.description=Un autre identifiant unique qui identifie cet ensemble de donnes (p.ex. le numro du producteur ou d'un autre dpt).
+datasetfieldtype.otherIdAgency.description=Nom de l'organisme qui a gnr cet identifiant
+datasetfieldtype.otherIdValue.description=Autre identifiant qui correspond  cet ensemble de donnes.
+datasetfieldtype.author.description=Les personnes, personnes morales ou organismes qui ont cr le travail. 
+datasetfieldtype.authorName.description=Le nom ou le prnom de l'auteur ou le nom de l'organisation responsable de cet ensemble de donnes.
+datasetfieldtype.authorAffiliation.description=L'organisme avec lequel l'auteur est affili.
+datasetfieldtype.authorIdentifierScheme.description=Nom du schma de l'identifiant (ORCID, ISNI).
+datasetfieldtype.authorIdentifier.description=Identifie de faon unique un auteur individuel ou une organisation selon divers schmas.
+datasetfieldtype.datasetContact.description=La ou les personnes-ressources pour cet ensemble de donnes.
+datasetfieldtype.datasetContactName.description=Le nom ou le prnom de la personne-ressource ou le nom de l'organisation.
+datasetfieldtype.datasetContactAffiliation.description=L'organisation avec laquelle la personne-ressource est affilie.
+datasetfieldtype.datasetContactEmail.description=L'adresse courriel du ou des personnes-ressources pour l'ensemble de donnes. Ces renseignements ne seront pas affichs.
+datasetfieldtype.dsDescription.description=Un rsum dcrivant l'objet, la nature et la porte de l'ensemble de donnes.
+datasetfieldtype.dsDescriptionValue.description=Un rsum dcrivant l'objet, la nature et la porte de l'ensemble de donnes
+datasetfieldtype.dsDescriptionDate.description=Dans les cas o un ensemble de donnes contient plus d'une description (par exemple, une peut tre fournie par le producteur de donnes et une autre peut tre prpare par le dpt de donnes o les donnes sont dposes), la date  laquelle l'attribut est utilis pour faire la distinction entre deux descriptions. La date de l'attribut respecte la convention de l'ISO AAAA-MM-JJ.
+datasetfieldtype.subject.description=Catgories de sujets propres aux domaines qui sont pertinents du point de vue du sujet  l'ensemble de donnes.
+datasetfieldtype.keyword.description=Les mots-cls qui dcrivent les aspects importants de l'ensemble de donnes.
+datasetfieldtype.keywordValue.description=Les termes-cls qui dcrivent les aspects importants de l'ensemble de donnes. Ils peuvent servir  crer des index de mots-cls et tre utiliss aux fins de classification et de rcupration. Un vocabulaire contrl peut tre utilis. L'attribut \u00A0vocab\u00A0 permet de prciser le type de vocabulaire contrl utilis, p. ex., LCSH, MeSH ou autres. L'attribut \u00A0vocabURI\u00A0 prcise l'emplacement du vocabulaire contrl complet.
+datasetfieldtype.keywordVocabulary.description=Pour prciser le type de vocabulaire contrl par mot-cl utilis, p. ex., LCSH, MeSH ou autres. 
+datasetfieldtype.keywordVocabularyURI.description=Le cas chant, adresse URL o est dcrit le vocabulaire de mots-cls utilis. Indiquer une adresse URL absolue, par exemple http://www.my.org.
+datasetfieldtype.topicClassification.description=Le champ classification indique les sujets et thmes gnraux importants couverts par les donnes. La classification de la Library of Congress peut tre utilise.
+datasetfieldtype.topicClassValue.description=Terme dcrivant un thme ou un sujet couvert par cet ensemble de donnes.
+datasetfieldtype.topicClassVocab.description=Pour prciser le type de vocabulaire contrl utilis, p. ex., LCSH, MeSH ou autres. 
+datasetfieldtype.topicClassVocabURI.description=Prcise l'adresse URL de la liste complte du vocabulaire contrl.
+datasetfieldtype.publication.description=Les publications qui utilisent les donnes provenant de cet ensemble de donnes.
+datasetfieldtype.publicationCitation.description=La rfrence bibliographique complte de cette publication connexe.
+datasetfieldtype.publicationIDType.description=Le type d'identifiant numrique utilis pour cette publication (p.ex. identificateur d'objet numrique (DOI)).
+datasetfieldtype.publicationIDNumber.description=L'identifiant du type d'identification slectionn.
+datasetfieldtype.publicationURL.description=Lien vers la page Web de la publication (p.ex. page de l'article paru dans une revue, notice du dpt ou autre).
+datasetfieldtype.notesText.description=Autres renseignements importants sur l'ensemble de donnes.
+datasetfieldtype.language.description=Langue de l'ensemble de donnes
+datasetfieldtype.producer.description=Personne ou organisation qui dtient la responsabilit financire ou administrative de cet ensemble de donnes.
+datasetfieldtype.producerName.description=Nom du producteur
+datasetfieldtype.producerAffiliation.description=L'organisation avec laquelle le producteur est affili.
+datasetfieldtype.producerAbbreviation.description=L'abrviation sous laquelle le producteur est communment connu (p.ex. IQSS, ICPSR).
+datasetfieldtype.producerURL.description=L'adresse URL du producteur indique la prsence sur le Web du producteur, le cas chant. Indiquer une adresse URL absolue o le site Web du producteur se trouve, par exemple http://www.my.org.
+datasetfieldtype.producerLogoURL.description=Adresse URL du logo du producteur qui pointe vers le logo accessible sur le Web. Indiquer une adresse URL absolue o l'image se trouve, par exemple http://www.my.org/images/logo.gif.
+datasetfieldtype.productionDate.description=Date  laquelle la collecte de donnes ou d'autres documents ont t produits (non distribus, publis ou archivs).
+datasetfieldtype.productionPlace.description=L'emplacement o la collecte de donnes et autres documents connexes ont t produits.
+datasetfieldtype.contributor.description=L'organisation ou la personne responsable de la collecte ou de la gestion d'une ressource, ou contribuant autrement  son dveloppement.
+datasetfieldtype.contributorType.description=Le type de collaborateur  la ressource.
+datasetfieldtype.contributorName.description=Le nom du collaborateur (nom, prnom ou nom de l'organisation)
+datasetfieldtype.grantNumber.description=Renseignements sur la subvention
+datasetfieldtype.grantNumberAgency.description=Organisme - numro de la subvention
+datasetfieldtype.grantNumberValue.description=Le numro de subvention ou de contrat li au financement.
+datasetfieldtype.distributor.description=L'organisation dsigne par l'auteur ou le producteur pour la mise en disponibilit de copies d'un travail particulier, y compris toute dition ou rvision.
+datasetfieldtype.distributorName.description=Nom du diffuseur
+datasetfieldtype.distributorAffiliation.description=L'organisation avec laquelle la personne-ressource du diffuseur est affilie.
+datasetfieldtype.distributorAbbreviation.description=L'abrviation sous laquelle le diffuseur est communment connu (p.ex. IQSS, ICPSR).
+datasetfieldtype.distributorURL.description=L'adresse URL du diffuseur indique la prsence sur le Web du diffuseur, le cas chant. Indiquer une adresse URL absolue o le site Web du diffuseur se trouve, par exemple http://www.my.org.
+datasetfieldtype.distributorLogoURL.description=Adresse URL du logo du diffuseur qui pointe vers l'image Web accessible de ce logo. Indiquer une adresse URL absolue o l'image se trouve, par exemple http://www.my.org/images/logo.gif. 
+datasetfieldtype.distributionDate.description=Date  laquelle les travaux ont t rendus disponibles aux fins de diffusion/prsentation.
+datasetfieldtype.depositor.description=La personne (nom, prnom) ou le nom de l'organisation qui a dpos cet ensemble de donnes dans le dpt.
+datasetfieldtype.dateOfDeposit.description=Date  laquelle l'ensemble de donnes a t dpos dans le dpt.
+datasetfieldtype.timePeriodCovered.description=Priode  laquelle les donnes se rapportent. Ceci fait rfrence  la priode couverte par les donnes et non aux dates de codage ou de cration des fichiers ou aux dates de collecte des donnes. Aussi appel l'tendue.
+datasetfieldtype.timePeriodCoveredStart.description=Date de dbut qui correspond  la priode couverte par les donnes et non aux dates de codage ou de cration des fichiers ou aux dates de collecte des donnes. 
+datasetfieldtype.timePeriodCoveredEnd.description=Date de fin qui correspond  la priode couverte par les donnes et non aux dates de codage ou de cration des fichiers ou aux dates de collecte des donnes.
+datasetfieldtype.dateOfCollection.description=Comprend la date  laquelle les donnes ont t recueillies.
+datasetfieldtype.dateOfCollectionStart.description=Date  laquelle la collecte de donnes a dbut.
+datasetfieldtype.dateOfCollectionEnd.description=Date  laquelle la collecte de donnes a pris fin.
+datasetfieldtype.kindOfData.description=Le type de donnes incluses dans le fichier: donnes d'enqute, donnes de recensement, donnes agrges, donnes cliniques, donnes issues de transactions, code source de programme, texte lisible par machine, donnes de dossiers administratifs, donnes exprimentales, test psychologique, donnes textuelles, texte cod, document cod, calendriers de vrification, donnes d'observation, donnes produites par traitement ou autres.
+datasetfieldtype.series.description=Renseignements sur la srie d'ensembles de donnes
+datasetfieldtype.seriesName.description=Nom de la srie de l'ensemble de donnes  laquelle l'ensemble de donnes appartient.
+datasetfieldtype.seriesInformation.description=Historique de la srie et rsum des caractristiques qui s'appliquent  la srie dans son ensemble.
+datasetfieldtype.software.description=Renseignements sur le logiciel utilis pour gnrer l'ensemble de donnes.
+datasetfieldtype.softwareName.description=Nom du logiciel utilis pour gnrer l'ensemble de donnes.
+datasetfieldtype.softwareVersion.description=Version du logiciel utilis pour gnrer l'ensemble de donnes.
+datasetfieldtype.relatedMaterial.description=Tout document li  cet ensemble de donnes.
+datasetfieldtype.relatedDatasets.description=Tout ensemble de donnes li  cet ensemble de donnes, comme la recherche prcdente sur ce sujet.
+datasetfieldtype.otherReferences.description=Toute rfrence qui servira de contexte ou de document de soutien pour cet ensemble de donnes.
+datasetfieldtype.dataSources.description=Liste des livres, articles, sries ou fichiers de donnes lisibles par machine qui ont servi de sources pour la collecte de donnes.
+datasetfieldtype.originOfSources.description=En ce qui concerne les documents historiques, les renseignements sur l'origine des sources et les rgles suivies dans l'tablissement des sources doivent tre indiqus.
+datasetfieldtype.characteristicOfSources.description=valuation et caractristiques des sources de donnes. 
+datasetfieldtype.accessToSources.description=Niveau de documentation des sources originales
+datasetfieldtype.title.watermark=Entrer le titre\u2026
+datasetfieldtype.subtitle.watermark=
+datasetfieldtype.alternativeTitle.watermark=
+datasetfieldtype.alternativeURL.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.otherId.watermark=
+datasetfieldtype.otherIdAgency.watermark=
+datasetfieldtype.otherIdValue.watermark=
+datasetfieldtype.author.watermark=
+datasetfieldtype.authorName.watermark=Nom, prnom ou nom de l'organisation
+datasetfieldtype.authorAffiliation.watermark=
+datasetfieldtype.authorIdentifierScheme.watermark=
+datasetfieldtype.authorIdentifier.watermark=
+datasetfieldtype.datasetContact.watermark=
+datasetfieldtype.datasetContactName.watermark=Nom, prnom ou nom de l'organisation
+datasetfieldtype.datasetContactAffiliation.watermark=
+datasetfieldtype.datasetContactEmail.watermark=
+datasetfieldtype.dsDescription.watermark=
+datasetfieldtype.dsDescriptionValue.watermark=
+datasetfieldtype.dsDescriptionDate.watermark=AAAA-MM-JJ
+datasetfieldtype.subject.watermark=
+datasetfieldtype.keyword.watermark=
+datasetfieldtype.keywordValue.watermark=
+datasetfieldtype.keywordVocabulary.watermark=
+datasetfieldtype.keywordVocabularyURI.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.topicClassification.watermark=
+datasetfieldtype.topicClassValue.watermark=
+datasetfieldtype.topicClassVocab.watermark=
+datasetfieldtype.topicClassVocabURI.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.publication.watermark=
+datasetfieldtype.publicationCitation.watermark=
+datasetfieldtype.publicationIDType.watermark=
+datasetfieldtype.publicationIDNumber.watermark=
+datasetfieldtype.publicationURL.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.notesText.watermark=
+datasetfieldtype.language.watermark=
+datasetfieldtype.producer.watermark=
+datasetfieldtype.producerName.watermark=Nom, prnom ou nom de l'organisation
+datasetfieldtype.producerAffiliation.watermark=
+datasetfieldtype.producerAbbreviation.watermark=
+datasetfieldtype.producerURL.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.producerLogoURL.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.productionDate.watermark=AAAA-MM-JJ
+datasetfieldtype.productionPlace.watermark=
+datasetfieldtype.contributor.watermark=
+datasetfieldtype.contributorType.watermark=
+datasetfieldtype.contributorName.watermark=Nom, prnom ou nom de l'organisation
+datasetfieldtype.grantNumber.watermark=
+datasetfieldtype.grantNumberAgency.watermark=
+datasetfieldtype.grantNumberValue.watermark=
+datasetfieldtype.distributor.watermark=
+datasetfieldtype.distributorName.watermark=Nom, prnom ou nom de l'organisation
+datasetfieldtype.distributorAffiliation.watermark=
+datasetfieldtype.distributorAbbreviation.watermark=
+datasetfieldtype.distributorURL.watermark=Entrer l'adresse URL complte commenant par http://
+datasetfieldtype.distributorLogoURL.watermark=Entrer l'adresse URL complte de l'image commenant par http://
+datasetfieldtype.distributionDate.watermark=AAAA-MM-JJ
+datasetfieldtype.depositor.watermark=
+datasetfieldtype.dateOfDeposit.watermark=AAAA-MM-JJ
+datasetfieldtype.timePeriodCovered.watermark=
+datasetfieldtype.timePeriodCoveredStart.watermark=AAAA-MM-JJ
+datasetfieldtype.timePeriodCoveredEnd.watermark=AAAA-MM-JJ
+datasetfieldtype.dateOfCollection.watermark=
+datasetfieldtype.dateOfCollectionStart.watermark=AAAA-MM-JJ
+datasetfieldtype.dateOfCollectionEnd.watermark=AAAA-MM-JJ
+datasetfieldtype.kindOfData.watermark=
+datasetfieldtype.series.watermark=
+datasetfieldtype.seriesName.watermark=
+datasetfieldtype.seriesInformation.watermark=
+datasetfieldtype.software.watermark=
+datasetfieldtype.softwareName.watermark=
+datasetfieldtype.softwareVersion.watermark=
+datasetfieldtype.relatedMaterial.watermark=
+datasetfieldtype.relatedDatasets.watermark=
+datasetfieldtype.otherReferences.watermark=
+datasetfieldtype.dataSources.watermark=
+datasetfieldtype.originOfSources.watermark=
+datasetfieldtype.characteristicOfSources.watermark=
+datasetfieldtype.accessToSources.watermark=
+controlledvocabulary.subject.agricultural_sciences=Sciences de l'agriculture
+controlledvocabulary.subject.arts_and_humanities=Arts et sciences humaines
+controlledvocabulary.subject.astronomy_and_astrophysics=Astronomie et astrophysique
+controlledvocabulary.subject.business_and_management=Affaires et gestion
+controlledvocabulary.subject.chemistry=Chimie
+controlledvocabulary.subject.computer_and_information_science=Informatique et science de l'information
+controlledvocabulary.subject.earth_and_environmental_sciences=Sciences de la terre et de l'environnement
+controlledvocabulary.subject.engineering=Gnie
+controlledvocabulary.subject.law=Droit
+controlledvocabulary.subject.mathematical_sciences=Sciences mathmatiques
+controlledvocabulary.subject.medicine,_health_and_life_sciences=Mdecine, sant et sciences de la vie
+controlledvocabulary.subject.physics=Physique
+controlledvocabulary.subject.social_sciences=Sciences sociales
+controlledvocabulary.subject.other=Autre
+controlledvocabulary.publicationIDType.ark=ark
+controlledvocabulary.publicationIDType.arxiv=arXiv
+controlledvocabulary.publicationIDType.bibcode=bibcode
+controlledvocabulary.publicationIDType.doi=doi
+controlledvocabulary.publicationIDType.ean13=ean13
+controlledvocabulary.publicationIDType.eissn=eissn
+controlledvocabulary.publicationIDType.handle=handle
+controlledvocabulary.publicationIDType.isbn=isbn
+controlledvocabulary.publicationIDType.issn=issn
+controlledvocabulary.publicationIDType.istc=istc
+controlledvocabulary.publicationIDType.lissn=lissn
+controlledvocabulary.publicationIDType.lsid=lsid
+controlledvocabulary.publicationIDType.pmid=pmid
+controlledvocabulary.publicationIDType.purl=purl
+controlledvocabulary.publicationIDType.upc=upc
+controlledvocabulary.publicationIDType.url=url
+controlledvocabulary.publicationIDType.urn=urn
+controlledvocabulary.contributorType.data_collector=Charg de la collecte de donnes
+controlledvocabulary.contributorType.data_curator=Intendant des donnes
+controlledvocabulary.contributorType.data_manager=Gestionnaire de donnes
+controlledvocabulary.contributorType.editor=diteur
+controlledvocabulary.contributorType.funder=Bailleur de fonds
+controlledvocabulary.contributorType.hosting_institution=tablissement hte
+controlledvocabulary.contributorType.project_leader=Chef de projet
+controlledvocabulary.contributorType.project_manager=Gestionnaire de projet
+controlledvocabulary.contributorType.project_member=Membre du projet
+controlledvocabulary.contributorType.related_person=Personne lie
+controlledvocabulary.contributorType.researcher=Chercheur
+controlledvocabulary.contributorType.research_group=Groupe de recherche
+controlledvocabulary.contributorType.rights_holder=Dtenteur de droits
+controlledvocabulary.contributorType.sponsor=Commanditaire
+controlledvocabulary.contributorType.supervisor=Superviseur
+controlledvocabulary.contributorType.work_package_leader=Chef d'un bloc de tches
+controlledvocabulary.contributorType.other=Autre
+controlledvocabulary.authorIdentifierScheme.orcid=ORCID
+controlledvocabulary.authorIdentifierScheme.isni=ISNI
+controlledvocabulary.authorIdentifierScheme.lcna=LCNA
+controlledvocabulary.authorIdentifierScheme.viaf=VIAF
+controlledvocabulary.authorIdentifierScheme.gnd=GND
+controlledvocabulary.language.abkhaz=Abkhaz
+controlledvocabulary.language.afar=Afar
+controlledvocabulary.language.afrikaans=Afrikaans
+controlledvocabulary.language.akan=Akan
+controlledvocabulary.language.albanian=Albanais
+controlledvocabulary.language.amharic=Amharique
+controlledvocabulary.language.arabic=Arabe
+controlledvocabulary.language.aragonese=Aragonais
+controlledvocabulary.language.armenian=Armnien
+controlledvocabulary.language.assamese=Assamais
+controlledvocabulary.language.avaric=Avar
+controlledvocabulary.language.avestan=Avesta
+controlledvocabulary.language.aymara=Amara
+controlledvocabulary.language.azerbaijani=Azerbadjanais
+controlledvocabulary.language.bambara=Bambara
+controlledvocabulary.language.bashkir=Bachkir
+controlledvocabulary.language.basque=Basque
+controlledvocabulary.language.belarusian=Bilorusse
+controlledvocabulary.language.bengali,_bangla=Bengali, bangla
+controlledvocabulary.language.bihari=Magahi
+controlledvocabulary.language.bislama=Bislama
+controlledvocabulary.language.bosnian=Bosnien
+controlledvocabulary.language.breton=Breton
+controlledvocabulary.language.bulgarian=Bulgare
+controlledvocabulary.language.burmese=Birman
+controlledvocabulary.language.catalan,valencian=Catalan, valencien
+controlledvocabulary.language.chamorro=Chamorro
+controlledvocabulary.language.chechen=Tchtchne
+controlledvocabulary.language.chichewa,_chewa,_nyanja=Chewa, cewa, nyanja
+controlledvocabulary.language.chinese=Mandarin, chinois
+controlledvocabulary.language.chuvash=Tchouvache
+controlledvocabulary.language.cornish=Cornique
+controlledvocabulary.language.corsican=Corse
+controlledvocabulary.language.cree=Cri
+controlledvocabulary.language.croatian=Croate
+controlledvocabulary.language.czech=Tchque
+controlledvocabulary.language.danish=Danois
+controlledvocabulary.language.divehi,_dhivehi,_maldivian=Divehi, maldivian
+controlledvocabulary.language.dutch=Hollandais, nerlandais
+controlledvocabulary.language.dzongkha=Dzonga
+controlledvocabulary.language.english=Anglais
+controlledvocabulary.language.esperanto=Espranto
+controlledvocabulary.language.estonian=Estonien
+controlledvocabulary.language.ewe=w
+controlledvocabulary.language.faroese=Froen
+controlledvocabulary.language.fijian=Fidjien
+controlledvocabulary.language.finnish=Finnois, finlandais
+controlledvocabulary.language.french=Franais
+controlledvocabulary.language.fula,_fulah,_pulaar,_pular=Fulfulde, foulani, pulaar
+controlledvocabulary.language.galician=Galicien
+controlledvocabulary.language.georgian=Gorgien
+controlledvocabulary.language.german=Allemand
+controlledvocabulary.language.greek_(modern)=Grec (moderne)
+controlledvocabulary.language.guarani=Guarani
+controlledvocabulary.language.gujarati=Gujarati
+controlledvocabulary.language.haitian,_haitian_creole=Hatien, crole hatien
+controlledvocabulary.language.hausa=Haoussa
+controlledvocabulary.language.hebrew_(modern)=Hbreu (moderne)
+controlledvocabulary.language.herero=Herero
+controlledvocabulary.language.hindi=Hindi
+controlledvocabulary.language.hiri_motu=Hiri-motu
+controlledvocabulary.language.hungarian=Hongrois
+controlledvocabulary.language.interlingua=Interlingua
+controlledvocabulary.language.indonesian=Indonsien
+controlledvocabulary.language.interlingue=Interlingue
+controlledvocabulary.language.irish=Irlandais
+controlledvocabulary.language.igbo=Igbo
+controlledvocabulary.language.inupiaq=Inupiaq
+controlledvocabulary.language.ido=Ido
+controlledvocabulary.language.icelandic=Islandais
+controlledvocabulary.language.italian=Italien
+controlledvocabulary.language.inuktitut=Inuktitut
+controlledvocabulary.language.japanese=Japonais
+controlledvocabulary.language.javanese=Javanais
+controlledvocabulary.language.kalaallisut,_greenlandic=Groenlandais
+controlledvocabulary.language.kannada=Kannada
+controlledvocabulary.language.kanuri=Kanuri
+controlledvocabulary.language.kashmiri=Kashmiri
+controlledvocabulary.language.kazakh=Kazakh
+controlledvocabulary.language.khmer=Khmer, cambodgien
+controlledvocabulary.language.kikuyu,_gikuyu=Kikuyu, gikuyu
+controlledvocabulary.language.kinyarwanda=Kinyarwanda
+controlledvocabulary.language.kyrgyz=Kirghiz
+controlledvocabulary.language.komi=Komi
+controlledvocabulary.language.kongo=Kikongo
+controlledvocabulary.language.korean=Coren
+controlledvocabulary.language.kurdish=Kurde
+controlledvocabulary.language.kwanyama,_kuanyama=Ovambo, cuanhama
+controlledvocabulary.language.latin=Latin
+controlledvocabulary.language.luxembourgish,_letzeburgesch=Luxembourgeois
+controlledvocabulary.language.ganda=Ganda
+controlledvocabulary.language.limburgish,_limburgan,_limburger=Limbourgeois,
+controlledvocabulary.language.lingala=Lingala
+controlledvocabulary.language.lao=Lao
+controlledvocabulary.language.lithuanian=Lituanien
+controlledvocabulary.language.luba-katanga=Luba-Katanga
+controlledvocabulary.language.latvian=Letton
+controlledvocabulary.language.manx=Manx
+controlledvocabulary.language.macedonian=Macdonien
+controlledvocabulary.language.malagasy=Malgache
+controlledvocabulary.language.malay=Malais
+controlledvocabulary.language.malayalam=Malayalam
+controlledvocabulary.language.maltese=Maltais
+controlledvocabulary.language.maori=Maori
+controlledvocabulary.language.marathi_(marathi)=Marathi (Mar\u0101\u1E6Dh\u012B)
+controlledvocabulary.language.marshallese=Marshallais
+controlledvocabulary.language.mixtepec_mixtec=Mixtepec Mixtec
+controlledvocabulary.language.mongolian=Mongol
+controlledvocabulary.language.nauru=Nauru
+controlledvocabulary.language.navajo,_navaho=Navaho
+controlledvocabulary.language.northern_ndebele=Ndbl du Nord
+controlledvocabulary.language.nepali=Npalais
+controlledvocabulary.language.ndonga=Ndonga
+controlledvocabulary.language.norwegian_bokmal=Bokmal
+controlledvocabulary.language.norwegian_nynorsk=Nonorvgien
+controlledvocabulary.language.norwegian=Norvgien
+controlledvocabulary.language.nuosu=Nuosu
+controlledvocabulary.language.southern_ndebele=Ndbl du Sud
+controlledvocabulary.language.occitan=Occitan
+controlledvocabulary.language.ojibwe,_ojibwa=Ojibw, ojibwa
+controlledvocabulary.language.old_church_slavonic,church_slavonic,old_bulgarian=Slavon liturgique, slavon d'glise, vieux bulgare
+controlledvocabulary.language.oromo=Oromo
+controlledvocabulary.language.oriya=Oriya
+controlledvocabulary.language.ossetian,_ossetic=Osste
+controlledvocabulary.language.panjabi,_punjabi=Pendjabi
+controlledvocabulary.language.pali=Pali
+controlledvocabulary.language.persian_(farsi)=Persan (dari)
+controlledvocabulary.language.polish=Polonais
+controlledvocabulary.language.pashto,_pushto=Pachto
+controlledvocabulary.language.portuguese=Portugais
+controlledvocabulary.language.quechua=Quechua
+controlledvocabulary.language.romansh=Romanche
+controlledvocabulary.language.kirundi=Kiroundi
+controlledvocabulary.language.romanian=Roumain
+controlledvocabulary.language.russian=Russe
+controlledvocabulary.language.sanskrit_(samskrta)=Sanskrit (Sa\u1E41sk\u1E5Bta)
+controlledvocabulary.language.sardinian=Sarde
+controlledvocabulary.language.sindhi=Sindhi
+controlledvocabulary.language.northern_sami=Lapon du Nord
+controlledvocabulary.language.samoan=Samoan
+controlledvocabulary.language.sango=Sango
+controlledvocabulary.language.serbian=Serbe
+controlledvocabulary.language.scottish_gaelic,_gaelic=Galique d'cosse, galique
+controlledvocabulary.language.shona=Shona
+controlledvocabulary.language.sinhala,_sinhalese=Singhalais, cinghalais
+controlledvocabulary.language.slovak=Slovaque
+controlledvocabulary.language.slovene=Slovne
+controlledvocabulary.language.somali=Somali
+controlledvocabulary.language.southern_sotho=Sotho du Sud
+controlledvocabulary.language.spanish,_castilian=Espagnol, castillan
+controlledvocabulary.language.sundanese=Soundanais
+controlledvocabulary.language.swahili=Swahili
+controlledvocabulary.language.swati=Swati
+controlledvocabulary.language.swedish=Sudois
+controlledvocabulary.language.tamil=Tamoul
+controlledvocabulary.language.telugu=Tlougou
+controlledvocabulary.language.tajik=Tadjik
+controlledvocabulary.language.thai=Tha
+controlledvocabulary.language.tigrinya=Tigrigna
+controlledvocabulary.language.tibetan_standard,_tibetan,_central=Tibtain standard, tibtain central
+controlledvocabulary.language.turkmen=Trkmne
+controlledvocabulary.language.tagalog=Tagalog
+controlledvocabulary.language.tswana=Bechouana
+controlledvocabulary.language.tonga_(tonga_islands)=Tonga (Tonga)
+controlledvocabulary.language.turkish=Turc
+controlledvocabulary.language.tsonga=Tsonga
+controlledvocabulary.language.tatar=Tatar
+controlledvocabulary.language.twi=Akuapem-twi
+controlledvocabulary.language.tahitian=Tahitien
+controlledvocabulary.language.uyghur,_uighur=Oughour, uygur
+controlledvocabulary.language.ukrainian=Ukrainien
+controlledvocabulary.language.urdu=Urdu
+controlledvocabulary.language.uzbek=Ouzbek
+controlledvocabulary.language.venda=Venda
+controlledvocabulary.language.vietnamese=Vietnamien
+controlledvocabulary.language.volapuk=Volapk
+controlledvocabulary.language.walloon=Walloon
+controlledvocabulary.language.welsh=Gallois
+controlledvocabulary.language.wolof=Yolof
+controlledvocabulary.language.western_frisian=Frison de l'Ouest
+controlledvocabulary.language.xhosa=Xhosa
+controlledvocabulary.language.yiddish=Yiddish
+controlledvocabulary.language.yoruba=Yoruba
+controlledvocabulary.language.zhuang,_chuang=Zhuang, chuang
+controlledvocabulary.language.zulu=Zoulou
+controlledvocabulary.language.not_applicable=Sans objet
\ No newline at end of file
diff --git a/src/main/java/customARCS.properties b/src/main/java/customARCS.properties
new file mode 100644
index 00000000000..e6665b94e64
--- /dev/null
+++ b/src/main/java/customARCS.properties
@@ -0,0 +1,29 @@
+metadatablock.name=customARCS
+metadatablock.displayName=Alliance for Research on Corporate Sustainability Metadata
+datasetfieldtype.ARCS1.title=1) Were any of these data sets a) purchased, b) obtained through licensed databases, or c) provided by an organization under a nondisclosure or other agreement?
+datasetfieldtype.ARCS2.title=2) If you responded Yes to Q1, have you ensured that sharing the data does not violate terms of the agreement? If you responded No to Q1, please enter N/A here.
+datasetfieldtype.ARCS3.title=3) Do any of these data sets include individual-level data (either collected or pre-existing in the dataset) that might make them subject to U.S. or international human subjects considerations?
+datasetfieldtype.ARCS4.title=4) If you responded Yes to Q3, are these data sets totally de-identified or was sharing approved by your institutional review board ( IRB)? If you responded No to Q3 please enter N/A here.
+datasetfieldtype.ARCS5.title=5) Do these datasets contain sensitive or personally identifiable private information? (Harvard Research Data Security Policy {www.security.harvard.edu/research-data-security-policy} may apply because this Dataverse is hosted by Harvard University.)
+datasetfieldtype.ARCS1.description=Licensed agreement of deposited data.
+datasetfieldtype.ARCS2.description=Data sharing does not violate terms.
+datasetfieldtype.ARCS3.description=Human subjects consideration.
+datasetfieldtype.ARCS4.description=Deidentified data/sharing approved by IRB.
+datasetfieldtype.ARCS5.description=Data contain sensitive/identifiable private information.
+datasetfieldtype.ARCS1.watermark=
+datasetfieldtype.ARCS2.watermark=
+datasetfieldtype.ARCS3.watermark=
+datasetfieldtype.ARCS4.watermark=
+datasetfieldtype.ARCS5.watermark=
+controlledvocabulary.ARCS1.no=No
+controlledvocabulary.ARCS1.yes=Yes
+controlledvocabulary.ARCS2.na=NA
+controlledvocabulary.ARCS2.no=No
+controlledvocabulary.ARCS2.yes=Yes
+controlledvocabulary.ARCS3.no=No
+controlledvocabulary.ARCS3.yes=Yes
+controlledvocabulary.ARCS4.na=NA
+controlledvocabulary.ARCS4.no=No
+controlledvocabulary.ARCS4.yes=Yes
+controlledvocabulary.ARCS5.no=No
+controlledvocabulary.ARCS5.yes=Yes
\ No newline at end of file
diff --git a/src/main/java/customCHIA.properties b/src/main/java/customCHIA.properties
new file mode 100644
index 00000000000..0b05e388cee
--- /dev/null
+++ b/src/main/java/customCHIA.properties
@@ -0,0 +1,20 @@
+metadatablock.name=customCHIA
+metadatablock.displayName=CHIA Metadata
+datasetfieldtype.sourceCHIA.title=Source
+datasetfieldtype.datesAdditionalInformationCHIA.title=Dates - Additional Information
+datasetfieldtype.variablesCHIA.title=Variables
+datasetfieldtype.classificationSchemaCHIA.title=Classification Schema
+datasetfieldtype.provenanceCHIA.title=Provenance
+datasetfieldtype.rightsAvailabilityCHIA.title=Rights/Availability
+datasetfieldtype.sourceCHIA.description=Source - This describes the source of the data. Is it from the Bureau of Labor and Statistics? Is it data from the United Nations?
+datasetfieldtype.datesAdditionalInformationCHIA.description=Dates - Additional Information - Note any additional information about dates or time periods in the dataset including intervals (annual, decennial, centennial, etc.) Also note the column(s) in the dataset where dates and other temporal information can be found.
+datasetfieldtype.variablesCHIA.description=Variables - Define the variables in this dataset. Please note the column in the dataset where variable information can be found.
+datasetfieldtype.classificationSchemaCHIA.description=Classification Schema - If there is a classification scheme in this dataset, please describe it. For example, M_20_24 should be read as Males, aged 20-24.
+datasetfieldtype.provenanceCHIA.description=Provenance - The provenance of the datasets is the record of ownership and will be used as a guide to the authenticity or quality of the data. For example, the Provenance statement might be, "This dataset was created from data collected by David Ruvolo during a data collection trip to Spain in 1992. Since that time, the data has not been altered other than to migrate it to more current formats."
+datasetfieldtype.rightsAvailabilityCHIA.description=Rights/Availability - Do you have the rights to share this data?
+datasetfieldtype.sourceCHIA.watermark=
+datasetfieldtype.datesAdditionalInformationCHIA.watermark=
+datasetfieldtype.variablesCHIA.watermark=
+datasetfieldtype.classificationSchemaCHIA.watermark=
+datasetfieldtype.provenanceCHIA.watermark=
+datasetfieldtype.rightsAvailabilityCHIA.watermark=
\ No newline at end of file
diff --git a/src/main/java/customDigaai.properties b/src/main/java/customDigaai.properties
new file mode 100644
index 00000000000..85d7df1f2b7
--- /dev/null
+++ b/src/main/java/customDigaai.properties
@@ -0,0 +1,55 @@
+metadatablock.name=customDigaai
+metadatablock.displayName=Digaai Metadata
+datasetfieldtype.titulo.title=Ttulo
+datasetfieldtype.numero.title=Nmero
+datasetfieldtype.datadePublicao.title=Data de Publicao
+datasetfieldtype.localdePublicao.title=Local de Publicao
+datasetfieldtype.proprietrio.title=Proprietrio
+datasetfieldtype.titulo.description=Ttulo do jornal ou revista.
+datasetfieldtype.numero.description=Nmero do jornal ou revista.
+datasetfieldtype.datadePublicao.description=Entrar dia/mes/ano.
+datasetfieldtype.localdePublicao.description=Local de Publicao.
+datasetfieldtype.proprietrio.description=Proprietrio
+datasetfieldtype.titulo.watermark=
+datasetfieldtype.numero.watermark=
+datasetfieldtype.datadePublicao.watermark=dia/mes/ano
+datasetfieldtype.localdePublicao.watermark=
+datasetfieldtype.proprietrio.watermark=
+controlledvocabulary.titulo.achei_usa=Achei USA
+controlledvocabulary.titulo.acontece_magazine=Acontece Magazine
+controlledvocabulary.titulo.a_noticia=A Notcia
+controlledvocabulary.titulo.brasil_best=Brasil Best
+controlledvocabulary.titulo.brasileiros_&_brasileiras=Brasileiros & Brasileiras
+controlledvocabulary.titulo.brasil_usa=Brasil USA
+controlledvocabulary.titulo.brazil_explore=Brazil Explore
+controlledvocabulary.titulo.brazilian_press=Brazilian Press
+controlledvocabulary.titulo.brazilian_voice=Brazilian Voice
+controlledvocabulary.titulo.brazil_news=Brazil News
+controlledvocabulary.titulo.brazuca=Brazuca
+controlledvocabulary.titulo.cia_brasil=Cia Brasil
+controlledvocabulary.titulo.comunidade_news=Comunidade News
+controlledvocabulary.titulo.diario_do_brasil=Dirio do Brasil
+controlledvocabulary.titulo.facebrasil=FaceBrasil
+controlledvocabulary.titulo.green_and_yellow_news=Green and Yellow News
+controlledvocabulary.titulo.jornal_dos_sports=Jornal dos Sports
+controlledvocabulary.titulo.jornal_moderno=Jornal Moderno
+controlledvocabulary.titulo.metropolitan=Metropolitan
+controlledvocabulary.titulo.national=National
+controlledvocabulary.titulo.negocio_fechado=Negcio Fechado
+controlledvocabulary.titulo.nossa_gente=Nossa Gente
+controlledvocabulary.titulo.nossa_terra=Nossa Terra
+controlledvocabulary.titulo.o_brasileirinho=O Brasileirinho
+controlledvocabulary.titulo.o_imigrante_cristao=O Imigrante Cristo
+controlledvocabulary.titulo.o_jornal_brasileiro=O Jornal Brasileiro
+controlledvocabulary.titulo.o_novo_mundo=O Novo Mundo
+controlledvocabulary.titulo.o_popular=O Popular
+controlledvocabulary.titulo.revista_linha_aberta=Revista Linha Aberta
+controlledvocabulary.titulo.revista_massa=Revista MASSA
+controlledvocabulary.titulo.revista_tititi=Revista Tititi
+controlledvocabulary.titulo.sucesso_usa=Sucesso USA
+controlledvocabulary.titulo.ta_na_mao=Ta na Mo
+controlledvocabulary.titulo.tc_brazil=TC Brazil
+controlledvocabulary.titulo.texas_magazine=Texas Magazine
+controlledvocabulary.titulo.the_brazilian_journal=The Brazilian Journal
+controlledvocabulary.titulo.today_magazine=Today Magazine
+controlledvocabulary.titulo.viver_magazine=Viver Magazine
\ No newline at end of file
diff --git a/src/main/java/customGSD.properties b/src/main/java/customGSD.properties
new file mode 100644
index 00000000000..15f118c73c4
--- /dev/null
+++ b/src/main/java/customGSD.properties
@@ -0,0 +1,552 @@
+metadatablock.name=customGSD
+metadatablock.displayName=Graduate School of Design Metadata
+datasetfieldtype.gsdStudentName.title=Student Name
+datasetfieldtype.gsdStudentProgram.title=Student's Program of Study
+datasetfieldtype.gsdCourseName.title=Course Name
+datasetfieldtype.gsdFacultyName.title=Faculty Name
+datasetfieldtype.gsdCoordinator.title=Core Studio Coordinator
+datasetfieldtype.gsdSemester.title=Semester / Year
+datasetfieldtype.gsdRecommendation.title=Faculty Recommendation
+datasetfieldtype.gsdAccreditation.title=Accreditation
+datasetfieldtype.gsdSiteType.title=Site Type
+datasetfieldtype.gsdProgramBrief.title=Program / Brief
+datasetfieldtype.gsdTypes.title=Types of Representation/ Medium/ Format
+datasetfieldtype.gsdPrizes.title=Prizes
+datasetfieldtype.gsdTags.title=GSD Tags
+datasetfieldtype.gsdStudentName.description=Full name of the student: Last Name, First Name (example: Smith, Jane). Use the name that the GSD Administrator has on file.
+datasetfieldtype.gsdStudentProgram.description=Student's program of study.
+datasetfieldtype.gsdCourseName.description=Name of the course.
+datasetfieldtype.gsdFacultyName.description=Name of the studio instructor.
+datasetfieldtype.gsdCoordinator.description=Name of the studio coordinator(s).
+datasetfieldtype.gsdSemester.description=Select the semester / year.
+datasetfieldtype.gsdRecommendation.description=Indicate the recommendation(s) from the faculty for this project.
+datasetfieldtype.gsdAccreditation.description=Selection made by faculty.
+datasetfieldtype.gsdSiteType.description=Describe the type of building or site, based on function / purpose. Example: Military base.
+datasetfieldtype.gsdProgramBrief.description=Example: redevelopment, restoration.
+datasetfieldtype.gsdTypes.description=Choose from the list.
+datasetfieldtype.gsdPrizes.description=Choose from the list.
+datasetfieldtype.gsdTags.description=Use tags to describe the project. Write one keyword per field. To add more tags, click on the plus sign on the right.
+datasetfieldtype.gsdStudentName.watermark=LastName, FirstName
+datasetfieldtype.gsdStudentProgram.watermark=
+datasetfieldtype.gsdCourseName.watermark=
+datasetfieldtype.gsdFacultyName.watermark=
+datasetfieldtype.gsdCoordinator.watermark=
+datasetfieldtype.gsdSemester.watermark=
+datasetfieldtype.gsdRecommendation.watermark=
+datasetfieldtype.gsdAccreditation.watermark=
+datasetfieldtype.gsdSiteType.watermark=
+datasetfieldtype.gsdProgramBrief.watermark=
+datasetfieldtype.gsdTypes.watermark=
+datasetfieldtype.gsdPrizes.watermark=
+datasetfieldtype.gsdTags.watermark=
+controlledvocabulary.gsdFacultyName.abalos,_inaki=Abalos, Inaki
+controlledvocabulary.gsdFacultyName.adjaye,_david=Adjaye, David
+controlledvocabulary.gsdFacultyName.adofo-wilson,_baye=Adofo-Wilson, Baye
+controlledvocabulary.gsdFacultyName.agre,_claire=Agre, Claire
+controlledvocabulary.gsdFacultyName.altringer,_beth=Altringer, Beth
+controlledvocabulary.gsdFacultyName.apfelbaum,_steven=Apfelbaum, Steven
+controlledvocabulary.gsdFacultyName.aquino,_gerdo=Aquino, Gerdo
+controlledvocabulary.gsdFacultyName.asensio_villoria,_leire=Asensio Villoria, Leire
+controlledvocabulary.gsdFacultyName.baines,_bridget=Baines, Bridget
+controlledvocabulary.gsdFacultyName.bandy,_vincent=Bandy, Vincent
+controlledvocabulary.gsdFacultyName.barkan,_katy=Barkan, Katy
+controlledvocabulary.gsdFacultyName.barkow,_frank=Barkow, Frank
+controlledvocabulary.gsdFacultyName.beard,_peter=Beard, Peter
+controlledvocabulary.gsdFacultyName.belanger,_pierre=Belanger, Pierre
+controlledvocabulary.gsdFacultyName.benedito,_silvia=Benedito, Silvia
+controlledvocabulary.gsdFacultyName.berrizbeitia,_ann=Berrizbeitia, Ann
+controlledvocabulary.gsdFacultyName.bewtra,_manisha=Bewtra, Manisha
+controlledvocabulary.gsdFacultyName.blau,_eve=Blau, Eve
+controlledvocabulary.gsdFacultyName.bozdogan,_sibel=Bozdogan, Sibel
+controlledvocabulary.gsdFacultyName.brandlhuber,_arno=Brandlhuber, Arno
+controlledvocabulary.gsdFacultyName.brenner,_neil=Brenner, Neil
+controlledvocabulary.gsdFacultyName.buchard,_jeffry=Buchard, Jeffry
+controlledvocabulary.gsdFacultyName.buckler,_julie=Buckler, Julie
+controlledvocabulary.gsdFacultyName.burchard,_jeffry=Burchard, Jeffry
+controlledvocabulary.gsdFacultyName.busquets,_joan=Busquets, Joan
+controlledvocabulary.gsdFacultyName.callejas_mujica,_luis_rodrigo=Callejas Mujica, Luis Rodrigo
+controlledvocabulary.gsdFacultyName.calvillo,_nerea=Calvillo, Nerea
+controlledvocabulary.gsdFacultyName.cantrell,_bradley=Cantrell, Bradley
+controlledvocabulary.gsdFacultyName.carras,_james=Carras, James
+controlledvocabulary.gsdFacultyName.castillo,_jose=Castillo, Jose
+controlledvocabulary.gsdFacultyName.cephas,_jana=Cephas, Jana
+controlledvocabulary.gsdFacultyName.cheng,_christine=Cheng, Christine
+controlledvocabulary.gsdFacultyName.cohen,_preston_scott=Cohen, Preston Scott
+controlledvocabulary.gsdFacultyName.coignet,_philippe=Coignet, Philippe
+controlledvocabulary.gsdFacultyName.cook,_peter=Cook, Peter
+controlledvocabulary.gsdFacultyName.corneil,_janne=Corneil, Janne
+controlledvocabulary.gsdFacultyName.correa,_felipe=Correa, Felipe
+controlledvocabulary.gsdFacultyName.craig,_salmaan=Craig, Salmaan
+controlledvocabulary.gsdFacultyName.curtis,_lawrence=Curtis, Lawrence
+controlledvocabulary.gsdFacultyName.daoust,_renee=Daoust, Renee
+controlledvocabulary.gsdFacultyName.davis,_diane=Davis, Diane
+controlledvocabulary.gsdFacultyName.de_broche_des_combes,_eric=de Broche des Combes, Eric
+controlledvocabulary.gsdFacultyName.de_castro_mazarro,_alejandro=de Castro Mazarro, Alejandro
+controlledvocabulary.gsdFacultyName.de_meuron,_pierre=de Meuron, Pierre
+controlledvocabulary.gsdFacultyName.del_tredici,_peter=Del Tredici, Peter
+controlledvocabulary.gsdFacultyName.desimini,_jill=Desimini, Jill
+controlledvocabulary.gsdFacultyName.desvigne,_michel=Desvigne, Michel
+controlledvocabulary.gsdFacultyName.d'oca,_daniel=D'Oca, Daniel
+controlledvocabulary.gsdFacultyName.doherty,_gareth=Doherty, Gareth
+controlledvocabulary.gsdFacultyName.doran,_kelly=Doran, Kelly
+controlledvocabulary.gsdFacultyName.duempelmann,_sonja=Duempelmann, Sonja
+controlledvocabulary.gsdFacultyName.echeverria,_inaki=Echeverria, Inaki
+controlledvocabulary.gsdFacultyName.eigen,_ed=Eigen, Ed
+controlledvocabulary.gsdFacultyName.elkin,_rosetta=Elkin, Rosetta
+controlledvocabulary.gsdFacultyName.ellis,_erle=Ellis, Erle
+controlledvocabulary.gsdFacultyName.etzler,_danielle=Etzler, Danielle
+controlledvocabulary.gsdFacultyName.evans,_teman=Evans, Teman
+controlledvocabulary.gsdFacultyName.flores_dewey,_onesimo=Flores Dewey, Onesimo
+controlledvocabulary.gsdFacultyName.forsyth,_ann=Forsyth, Ann
+controlledvocabulary.gsdFacultyName.frederickson,_kristin=Frederickson, Kristin
+controlledvocabulary.gsdFacultyName.gamble,_david=Gamble, David
+controlledvocabulary.gsdFacultyName.garcia_grinda,_efren=Garcia Grinda, Efren
+controlledvocabulary.gsdFacultyName.garciavelez_alfaro,_carlos=Garciavelez Alfaro, Carlos
+controlledvocabulary.gsdFacultyName.geers,_kersten=Geers, Kersten
+controlledvocabulary.gsdFacultyName.gelabert-sanchez,_ana=Gelabert-Sanchez, Ana
+controlledvocabulary.gsdFacultyName.georgoulias,_andreas=Georgoulias, Andreas
+controlledvocabulary.gsdFacultyName.geuze,_adriaan=Geuze, Adriaan
+controlledvocabulary.gsdFacultyName.gillies-smith,_shauna=Gillies-Smith, Shauna
+controlledvocabulary.gsdFacultyName.ham,_derek=Ham, Derek
+controlledvocabulary.gsdFacultyName.hansch,_inessa=Hansch, Inessa
+controlledvocabulary.gsdFacultyName.hansen,_andrea=Hansen, Andrea
+controlledvocabulary.gsdFacultyName.harabasz,_ewa=Harabasz, Ewa
+controlledvocabulary.gsdFacultyName.hays,_k._michael=Hays, K. Michael
+controlledvocabulary.gsdFacultyName.herzog,_jacques=Herzog, Jacques
+controlledvocabulary.gsdFacultyName.hilderbrand,_gary=Hilderbrand, Gary
+controlledvocabulary.gsdFacultyName.hoberman,_chuck=Hoberman, Chuck
+controlledvocabulary.gsdFacultyName.hong,_zaneta=Hong, Zaneta
+controlledvocabulary.gsdFacultyName.hooftman,_eelco=Hooftman, Eelco
+controlledvocabulary.gsdFacultyName.hooper,_michael=Hooper, Michael
+controlledvocabulary.gsdFacultyName.howeler,_eric=Howeler, Eric
+controlledvocabulary.gsdFacultyName.hoxie,_christopher=Hoxie, Christopher
+controlledvocabulary.gsdFacultyName.hung,_ying-yu=Hung, Ying-Yu
+controlledvocabulary.gsdFacultyName.hunt,_john=Hunt, John
+controlledvocabulary.gsdFacultyName.hutton,_jane=Hutton, Jane
+controlledvocabulary.gsdFacultyName.hyde,_timothy=Hyde, Timothy
+controlledvocabulary.gsdFacultyName.ibanez,_mariana=Ibanez, Mariana
+controlledvocabulary.gsdFacultyName.idenburg,_florian=Idenburg, Florian
+controlledvocabulary.gsdFacultyName.johnston,_sharon=Johnston, Sharon
+controlledvocabulary.gsdFacultyName.kayden,_jerold=Kayden, Jerold
+controlledvocabulary.gsdFacultyName.khamsi,_james=Khamsi, James
+controlledvocabulary.gsdFacultyName.kiefer,_matthew=Kiefer, Matthew
+controlledvocabulary.gsdFacultyName.kirkwood,_niall=Kirkwood, Niall
+controlledvocabulary.gsdFacultyName.koolhaas,_remment=Koolhaas, Remment
+controlledvocabulary.gsdFacultyName.krieger,_alex=Krieger, Alex
+controlledvocabulary.gsdFacultyName.kuo,_max=Kuo, Max
+controlledvocabulary.gsdFacultyName.la,_grace=La, Grace
+controlledvocabulary.gsdFacultyName.lacaton,_anne=Lacaton, Anne
+controlledvocabulary.gsdFacultyName.laszlo_tait,_rachel=Laszlo Tait, Rachel
+controlledvocabulary.gsdFacultyName.leach,_neil=Leach, Neil
+controlledvocabulary.gsdFacultyName.lee,_chris=Lee, Chris
+controlledvocabulary.gsdFacultyName.lee,_christopher=Lee, Christopher
+controlledvocabulary.gsdFacultyName.lee,_mark=Lee, Mark
+controlledvocabulary.gsdFacultyName.legendre,_george_l.=Legendre, George L.
+controlledvocabulary.gsdFacultyName.lehrer,_mia=Lehrer, Mia
+controlledvocabulary.gsdFacultyName.liaropoulos-legendre,_george=Liaropoulos-Legendre, George
+controlledvocabulary.gsdFacultyName.long,_judith=Long, Judith
+controlledvocabulary.gsdFacultyName.lopez-pineiro,_sergio=Lopez-Pineiro, Sergio
+controlledvocabulary.gsdFacultyName.lott,_jonathan=Lott, Jonathan
+controlledvocabulary.gsdFacultyName.madden,_kathryn=Madden, Kathryn
+controlledvocabulary.gsdFacultyName.mah,_david=Mah, David
+controlledvocabulary.gsdFacultyName.malkawi,_ali=Malkawi, Ali
+controlledvocabulary.gsdFacultyName.maltzan,_michael=Maltzan, Michael
+controlledvocabulary.gsdFacultyName.manfredi,_michael=Manfredi, Michael
+controlledvocabulary.gsdFacultyName.marchant,_edward=Marchant, Edward
+controlledvocabulary.gsdFacultyName.mateo,_josep_lluis=Mateo, Josep Lluis
+controlledvocabulary.gsdFacultyName.mccafferty,_patrick=McCafferty, Patrick
+controlledvocabulary.gsdFacultyName.mcintosh,_alistair=McIntosh, Alistair
+controlledvocabulary.gsdFacultyName.mcloskey,_karen=MCloskey, Karen
+controlledvocabulary.gsdFacultyName.mehrotra,_rahul=Mehrotra, Rahul
+controlledvocabulary.gsdFacultyName.menchaca,_alejandra=Menchaca, Alejandra
+controlledvocabulary.gsdFacultyName.menges,_achim=Menges, Achim
+controlledvocabulary.gsdFacultyName.menges,_achim=Menges, Achim
+controlledvocabulary.gsdFacultyName.michalatos,_panagiotis=Michalatos, Panagiotis
+controlledvocabulary.gsdFacultyName.moe,_kiel=Moe, Kiel
+controlledvocabulary.gsdFacultyName.molinsky,_jennifer=Molinsky, Jennifer
+controlledvocabulary.gsdFacultyName.moreno,_cristina_diaz=Moreno, Cristina Diaz
+controlledvocabulary.gsdFacultyName.mori,_toshiko=Mori, Toshiko
+controlledvocabulary.gsdFacultyName.moussavi,_farshid=Moussavi, Farshid
+controlledvocabulary.gsdFacultyName.mulligan,_mark=Mulligan, Mark
+controlledvocabulary.gsdFacultyName.muro,_carles=Muro, Carles
+controlledvocabulary.gsdFacultyName.naginski,_erika=Naginski, Erika
+controlledvocabulary.gsdFacultyName.najle,_ciro=Najle, Ciro
+controlledvocabulary.gsdFacultyName.nakazawa,_paul=Nakazawa, Paul
+controlledvocabulary.gsdFacultyName.navarro_rios,_victor=Navarro Rios, Victor
+controlledvocabulary.gsdFacultyName.nichols,_albert=Nichols, Albert
+controlledvocabulary.gsdFacultyName.o'carroll,_aisling=O'Carroll, Aisling
+controlledvocabulary.gsdFacultyName.o'donnell,_sheila=O'Donnell, Sheila
+controlledvocabulary.gsdFacultyName.oman,_rok=Oman, Rok
+controlledvocabulary.gsdFacultyName.o'neill-uzgiris,_kelly_ann=O'Neill-Uzgiris, Kelly Ann
+controlledvocabulary.gsdFacultyName.oppenheim,_chad=Oppenheim, Chad
+controlledvocabulary.gsdFacultyName.other=Other
+controlledvocabulary.gsdFacultyName.ozay,_erkin=Ozay, Erkin
+controlledvocabulary.gsdFacultyName.panzano,_megan=Panzano, Megan
+controlledvocabulary.gsdFacultyName.park,_peter=Park, Peter
+controlledvocabulary.gsdFacultyName.parsons,_katharine=Parsons, Katharine
+controlledvocabulary.gsdFacultyName.peiser,_richard=Peiser, Richard
+controlledvocabulary.gsdFacultyName.petcu,_constantin=Petcu, Constantin
+controlledvocabulary.gsdFacultyName.petrescu,_doina=Petrescu, Doina
+controlledvocabulary.gsdFacultyName.pietrusko,_robert=Pietrusko, Robert
+controlledvocabulary.gsdFacultyName.rahm,_philippe=Rahm, Philippe
+controlledvocabulary.gsdFacultyName.raspall_galli,_carlos_felix=Raspall Galli, Carlos Felix
+controlledvocabulary.gsdFacultyName.reed,_chris=Reed, Chris
+controlledvocabulary.gsdFacultyName.rein-cano,_martin=Rein-Cano, Martin
+controlledvocabulary.gsdFacultyName.restrepo_ochoa,_camilo=Restrepo Ochoa, Camilo
+controlledvocabulary.gsdFacultyName.rich,_damon=Rich, Damon
+controlledvocabulary.gsdFacultyName.rocker,_ingeborg=Rocker, Ingeborg
+controlledvocabulary.gsdFacultyName.rojo,_marcos=Rojo, Marcos
+controlledvocabulary.gsdFacultyName.rosenthal,_joyce_klein=Rosenthal, Joyce Klein
+controlledvocabulary.gsdFacultyName.rowe,_peter=Rowe, Peter
+controlledvocabulary.gsdFacultyName.ryan,_thomas=Ryan, Thomas
+controlledvocabulary.gsdFacultyName.samuelson,_holly=Samuelson, Holly
+controlledvocabulary.gsdFacultyName.sarkis,_a._hashim=Sarkis, A. Hashim
+controlledvocabulary.gsdFacultyName.schumacher,_patrik=Schumacher, Patrik
+controlledvocabulary.gsdFacultyName.schwartz,_martha=Schwartz, Martha
+controlledvocabulary.gsdFacultyName.scogin,_buford=Scogin, Buford
+controlledvocabulary.gsdFacultyName.scogin,_mack=Scogin, Mack
+controlledvocabulary.gsdFacultyName.sennett,_richard=Sennett, Richard
+controlledvocabulary.gsdFacultyName.sentkiewicz,_renata=Sentkiewicz, Renata
+controlledvocabulary.gsdFacultyName.shigematsu,_shohei=Shigematsu, Shohei
+controlledvocabulary.gsdFacultyName.silman,_robert=Silman, Robert
+controlledvocabulary.gsdFacultyName.silver,_mitchell=Silver, Mitchell
+controlledvocabulary.gsdFacultyName.silvetti,_jorge=Silvetti, Jorge
+controlledvocabulary.gsdFacultyName.smith,_christine=Smith, Christine
+controlledvocabulary.gsdFacultyName.snyder,_susan=Snyder, Susan
+controlledvocabulary.gsdFacultyName.solano,_laura=Solano, Laura
+controlledvocabulary.gsdFacultyName.sorkin,_michael=Sorkin, Michael
+controlledvocabulary.gsdFacultyName.spiegelman,_kathy=Spiegelman, Kathy
+controlledvocabulary.gsdFacultyName.stilgoe,_john=Stilgoe, John
+controlledvocabulary.gsdFacultyName.stockard,_james=Stockard, James
+controlledvocabulary.gsdFacultyName.tato,_belinda=Tato, Belinda
+controlledvocabulary.gsdFacultyName.thomas,_george=Thomas, George
+controlledvocabulary.gsdFacultyName.thompson,_maryann=Thompson, Maryann
+controlledvocabulary.gsdFacultyName.torto,_raymond=Torto, Raymond
+controlledvocabulary.gsdFacultyName.tuomey,_john=Tuomey, John
+controlledvocabulary.gsdFacultyName.urbanski,_matthew=Urbanski, Matthew
+controlledvocabulary.gsdFacultyName.valenzuela,_luis=Valenzuela, Luis
+controlledvocabulary.gsdFacultyName.vallejo,_jose_luis=Vallejo, Jose Luis
+controlledvocabulary.gsdFacultyName.van_valkenburgh,_michael=Van Valkenburgh, Michael
+controlledvocabulary.gsdFacultyName.vandersys,_keith=VanDerSys, Keith
+controlledvocabulary.gsdFacultyName.vecitis,_chad=Vecitis, Chad
+controlledvocabulary.gsdFacultyName.videcnik,_spela=Videcnik, Spela
+controlledvocabulary.gsdFacultyName.waldheim,_charles=Waldheim, Charles
+controlledvocabulary.gsdFacultyName.wang,_bing=Wang, Bing
+controlledvocabulary.gsdFacultyName.weitz,_david=Weitz, David
+controlledvocabulary.gsdFacultyName.wendel,_delia=Wendel, Delia
+controlledvocabulary.gsdFacultyName.whittaker,_elizabeth=Whittaker, Elizabeth
+controlledvocabulary.gsdFacultyName.wickersham,_jay=Wickersham, Jay
+controlledvocabulary.gsdFacultyName.witt,_andrew=Witt, Andrew
+controlledvocabulary.gsdFacultyName.wodiczko,_krzysztof=Wodiczko, Krzysztof
+controlledvocabulary.gsdFacultyName.wood,_robert=Wood, Robert
+controlledvocabulary.gsdFacultyName.wu,_cameron=Wu, Cameron
+controlledvocabulary.gsdFacultyName.zickler,_todd=Zickler, Todd
+controlledvocabulary.gsdCoordinator.abalos,_inaki=Abalos, Inaki
+controlledvocabulary.gsdCoordinator.belanger,_pierre=Belanger, Pierre
+controlledvocabulary.gsdCoordinator.correa,_felipe=Correa, Felipe
+controlledvocabulary.gsdCoordinator.desimini,_jill=Desimini, Jill
+controlledvocabulary.gsdCoordinator.forsyth,_ann=Forsyth, Ann
+controlledvocabulary.gsdCoordinator.etzler,_danielle=Etzler, Danielle
+controlledvocabulary.gsdCoordinator.gelabert-sanchez,_ana=Gelabert-Sanchez, Ana
+controlledvocabulary.gsdCoordinator.hilderbrand,_gary=Hilderbrand, Gary
+controlledvocabulary.gsdCoordinator.howeler,_eric=Howeler, Eric
+controlledvocabulary.gsdCoordinator.howler,_eric=Howler, Eric
+controlledvocabulary.gsdCoordinator.hutton,_jane=Hutton, Jane
+controlledvocabulary.gsdCoordinator.ibanez,_mariana=Ibanez, Mariana
+controlledvocabulary.gsdCoordinator.idenburg,_florian=Idenburg, Florian
+controlledvocabulary.gsdCoordinator.la,_grace=La, Grace
+controlledvocabulary.gsdCoordinator.long,_judith_grant=Long, Judith Grant
+controlledvocabulary.gsdCoordinator.moe,_kiel=Moe, Kiel
+controlledvocabulary.gsdCoordinator.muro,_carles=Muro, Carles
+controlledvocabulary.gsdCoordinator.wu,_cameron=Wu, Cameron
+controlledvocabulary.gsdCoordinator.other=Other
+controlledvocabulary.gsdStudentProgram.ddes=DDes
+controlledvocabulary.gsdStudentProgram.march_i=MArch I
+controlledvocabulary.gsdStudentProgram.march_ii=MArch II
+controlledvocabulary.gsdStudentProgram.maud_or_mlaud=MAUD or MLAUD
+controlledvocabulary.gsdStudentProgram.mdes=MDes
+controlledvocabulary.gsdStudentProgram.mla_i=MLA I
+controlledvocabulary.gsdStudentProgram.mla_i_ap=MLA I AP
+controlledvocabulary.gsdStudentProgram.mla_ii=MLA II
+controlledvocabulary.gsdStudentProgram.mud=MUD
+controlledvocabulary.gsdStudentProgram.mup=MUP
+controlledvocabulary.gsdStudentProgram.mup/march=MUP/MArch
+controlledvocabulary.gsdStudentProgram.mup/maud_or_mlaud=MUP/MAUD or MLAUD
+controlledvocabulary.gsdStudentProgram.mup/mdes=MUP/MDes
+controlledvocabulary.gsdStudentProgram.mup/mla=MUP/MLA
+controlledvocabulary.gsdStudentProgram.other=Other
+controlledvocabulary.gsdStudentProgram.phd=PhD
+controlledvocabulary.gsdSemester.fall_2013=Fall 2013
+controlledvocabulary.gsdSemester.spring_2014=Spring 2014
+controlledvocabulary.gsdSemester.fall_2014=Fall 2014
+controlledvocabulary.gsdSemester.spring_2015=Spring 2015
+controlledvocabulary.gsdSemester.fall_2015=Fall 2015
+controlledvocabulary.gsdSemester.spring_2016=Spring 2016
+controlledvocabulary.gsdSemester.fall_2016=Fall 2016
+controlledvocabulary.gsdRecommendation.accreditation=Accreditation
+controlledvocabulary.gsdRecommendation.open_house=Open House
+controlledvocabulary.gsdRecommendation.platform=Platform
+controlledvocabulary.gsdRecommendation.website=Website
+controlledvocabulary.gsdTypes.animations=Animations
+controlledvocabulary.gsdTypes.axonometric_drawings=Axonometric drawings
+controlledvocabulary.gsdTypes.axonometric_projections=Axonometric projections
+controlledvocabulary.gsdTypes.diagrams=Diagrams
+controlledvocabulary.gsdTypes.drawings=Drawings
+controlledvocabulary.gsdTypes.elevations_(drawings)=Elevations (drawings)
+controlledvocabulary.gsdTypes.floor_plans=Floor plans
+controlledvocabulary.gsdTypes.isometric_drawings=Isometric drawings
+controlledvocabulary.gsdTypes.isometric_projections=Isometric projections
+controlledvocabulary.gsdTypes.maps=Maps
+controlledvocabulary.gsdTypes.master_plans=Master plans
+controlledvocabulary.gsdTypes.models_(representations)=Models (representations)
+controlledvocabulary.gsdTypes.other=Other
+controlledvocabulary.gsdTypes.perspective_drawings=Perspective drawings
+controlledvocabulary.gsdTypes.photographs=Photographs
+controlledvocabulary.gsdTypes.plans_(drawings)=Plans (drawings)
+controlledvocabulary.gsdTypes.plans_(maps)=Plans (maps)
+controlledvocabulary.gsdTypes.renderings=Renderings
+controlledvocabulary.gsdTypes.sectional_elevations=Sectional elevations
+controlledvocabulary.gsdTypes.sectional_perspectives=Sectional perspectives
+controlledvocabulary.gsdTypes.sections=Sections
+controlledvocabulary.gsdTypes.sections_(orthographic_projections)=Sections (orthographic projections)
+controlledvocabulary.gsdTypes.site_plans=Site plans
+controlledvocabulary.gsdTypes.sketches=Sketches
+controlledvocabulary.gsdTypes.videos=Videos
+controlledvocabulary.gsdPrizes.araldo_cossutta_annual_prize_for_design_excellence=Araldo Cossutta Annual Prize for Design Excellence
+controlledvocabulary.gsdPrizes.award_for_academic_excellence_in_urban_design=Award for Academic Excellence in Urban Design
+controlledvocabulary.gsdPrizes.award_for_academic_excellence_in_urban_planning=Award for Academic Excellence in Urban Planning
+controlledvocabulary.gsdPrizes.award_for_outstanding_leadership_in_urban_design=Award for Outstanding Leadership in Urban Design
+controlledvocabulary.gsdPrizes.award_for_outstanding_leadership_in_urban_planning=Award for Outstanding Leadership in Urban Planning
+controlledvocabulary.gsdPrizes.charles_eliot_traveling_fellowship_in_landscape_architecture=Charles Eliot Traveling Fellowship in Landscape Architecture
+controlledvocabulary.gsdPrizes.clifford_wong_prize_in_housing_design=Clifford Wong Prize in Housing Design
+controlledvocabulary.gsdPrizes.digital_design_prize=Digital Design Prize
+controlledvocabulary.gsdPrizes.dimitris_pikionis_award=Dimitris Pikionis Award
+controlledvocabulary.gsdPrizes.druker_traveling_fellowship=Druker Traveling Fellowship
+controlledvocabulary.gsdPrizes.ferdinand_colloredo-mansfeld_prize_for_superior_achievement_in_real_estate_studies=Ferdinand Colloredo-Mansfeld Prize for Superior Achievement in Real Estate Studies
+controlledvocabulary.gsdPrizes.frederick_sheldon_traveling_fellowship=Frederick Sheldon Traveling Fellowship
+controlledvocabulary.gsdPrizes.howard_t._fisher_prize_for_excellence_in_geographic_information_science=Howard T. Fisher Prize for Excellence in Geographic Information Science
+controlledvocabulary.gsdPrizes.jacob_weidenmann_prize=Jacob Weidenmann Prize
+controlledvocabulary.gsdPrizes.julia_amory_appleton_traveling_fellowship_in_architecture=Julia Amory Appleton Traveling Fellowship in Architecture
+controlledvocabulary.gsdPrizes.kevin_v._kieran_prize_(kevin_kieran_memorial_scholarship)=Kevin V. Kieran Prize (Kevin Kieran Memorial Scholarship)
+controlledvocabulary.gsdPrizes.norman_t._newton_prize=Norman T. Newton Prize
+controlledvocabulary.gsdPrizes.peter_rice_prize_for_innovation_in_architecture_and_structural_design=Peter Rice Prize for Innovation in Architecture and Structural Design
+controlledvocabulary.gsdPrizes.peter_walker_&_partners_fellowship_for_landscape_architecture=Peter Walker & Partners Fellowship for Landscape Architecture
+controlledvocabulary.gsdPrizes.sinclair_kennedy_traveling_fellowship=Sinclair Kennedy Traveling Fellowship
+controlledvocabulary.gsdPrizes.the_daniel_l._schodek_award_for_technology_and_sustainability=The Daniel L. Schodek Award for Technology and Sustainability
+controlledvocabulary.gsdAccreditation.high=High
+controlledvocabulary.gsdAccreditation.medium=Medium
+controlledvocabulary.gsdAccreditation.low=Low
+controlledvocabulary.gsdCourseName.01101:_first_semester_core:_project=01101: First Semester Core: PROJECT
+controlledvocabulary.gsdCourseName.01102:_second_semester_core:_situate=01102: Second Semester Core: SITUATE
+controlledvocabulary.gsdCourseName.01111:_la_i:_first_semester_core_studio=01111: LA I: First Semester Core Studio
+controlledvocabulary.gsdCourseName.01112:_landscape_architecture_ii=01112: Landscape Architecture II
+controlledvocabulary.gsdCourseName.01121:_first_semester_core_urban_planning_studio=01121: First Semester Core Urban Planning Studio
+controlledvocabulary.gsdCourseName.01122:_second_semester_core_urban_planning_studio=01122: Second Semester Core Urban Planning Studio
+controlledvocabulary.gsdCourseName.01201:_third_semester_core:_integrate=01201: Third Semester Core: INTEGRATE
+controlledvocabulary.gsdCourseName.01202:_fourth_semester_core:_relate=01202: Fourth Semester Core: RELATE
+controlledvocabulary.gsdCourseName.01211:_la_iii:_third_semester_core_studio=01211: LA III: Third Semester Core Studio
+controlledvocabulary.gsdCourseName.01212:_landscape_architecture_iv=01212: Landscape Architecture IV
+controlledvocabulary.gsdCourseName.01221:_elements_of_urban_design=01221: Elements of Urban Design
+controlledvocabulary.gsdCourseName.01301:_kyoto_studio_ii:_seasons_and_architecture=01301: Kyoto Studio II: Seasons and Architecture
+controlledvocabulary.gsdCourseName.01301:_the_function_of_time=01301: The Function of Time
+controlledvocabulary.gsdCourseName.01302:_architecture_club_london=01302: Architecture Club London
+controlledvocabulary.gsdCourseName.01302:_unfinished_work_iii=01302: Unfinished Work III
+controlledvocabulary.gsdCourseName.01303:_alimentary_design=01303: Alimentary Design
+controlledvocabulary.gsdCourseName.01303:_workplan=01303: Workplan
+controlledvocabulary.gsdCourseName.01304:_alimentary_design=01304: Alimentary Design
+controlledvocabulary.gsdCourseName.01304:_socio-environmental_responsive_design=01304: Socio-Environmental Responsive Design
+controlledvocabulary.gsdCourseName.01305:_built_climates=01305: Built Climates
+controlledvocabulary.gsdCourseName.01305:_parametric_semiology_-_high_performance_architecture_for_apple,_google_and_facebook=01305: Parametric Semiology - High Performance Architecture for Apple, Google and Facebook
+controlledvocabulary.gsdCourseName.01306:_21st_cent._arch.of_africa_and_the_diaspora=01306: 21st Cent. Arch.of Africa and the Diaspora
+controlledvocabulary.gsdCourseName.01306:_material_performance_-_fibrous_tectonics=01306: Material Performance - Fibrous Tectonics
+controlledvocabulary.gsdCourseName.01307:_la_strada_novissima=01307: La Strada Novissima
+controlledvocabulary.gsdCourseName.01307:_material_performance=01307: Material Performance
+controlledvocabulary.gsdCourseName.01308:_city_of_artificial_extrusions=01308: City of Artificial Extrusions
+controlledvocabulary.gsdCourseName.01308:_green_card_conversations=01308: Green Card Conversations
+controlledvocabulary.gsdCourseName.01309:_studio_alaska=01309: Studio Alaska
+controlledvocabulary.gsdCourseName.01309:_theatre_and_the_city=01309: Theatre and the City
+controlledvocabulary.gsdCourseName.01310:_architecture_of_cultural_prosthetics=01310: Architecture of Cultural Prosthetics
+controlledvocabulary.gsdCourseName.01310:_rotterdam_study_abroad_studio_option:_elements_of_architecture=01310: Rotterdam Study Abroad Studio Option: Elements of Architecture
+controlledvocabulary.gsdCourseName.01311:_apres_ski:_eco_village_les_diablerets=01311: Apres Ski: Eco Village Les Diablerets
+controlledvocabulary.gsdCourseName.01311:_the_forms_of_transition=01311: The Forms of Transition
+controlledvocabulary.gsdCourseName.01312:_"you_can't_die_in_disney_world"_a_zoo=01312: "You Can't Die in Disney World" A ZOO
+controlledvocabulary.gsdCourseName.01312:_basel_study_abroad_studio_option=01312: Basel Study Abroad Studio Option
+controlledvocabulary.gsdCourseName.01313:_indebted_architecture=01313: Indebted Architecture
+controlledvocabulary.gsdCourseName.01314:_in_the_land_of_nanduti:_following_the_lines,_threads,_and_figures_of_the_river=01314: IN THE LAND OF NANDUTi: following the lines, threads, and figures of the river
+controlledvocabulary.gsdCourseName.01315:_real_and_imaginary_variables_(final):_global_arenas=01315: Real and Imaginary Variables (Final): Global Arenas
+controlledvocabulary.gsdCourseName.01316:_high-rise_/_high-density=01316: High-rise / High-density
+controlledvocabulary.gsdCourseName.01317:_another_nature=01317: Another nature
+controlledvocabulary.gsdCourseName.01318:_borrominations,_or_the_auratic_dome=01318: Borrominations, or the Auratic Dome
+controlledvocabulary.gsdCourseName.01319:_thermodynamic_materialism_applied_to_dense_urban_conglomerates,_two_chinese_case_studies=01319: Thermodynamic Materialism Applied to Dense Urban Conglomerates, Two Chinese Case Studies
+controlledvocabulary.gsdCourseName.01401:_a_new_[landscape]_infrastructure_for_los_angeles=01401: A New [Landscape] Infrastructure for Los Angeles
+controlledvocabulary.gsdCourseName.01401:_liminal_space=01401: Liminal Space
+controlledvocabulary.gsdCourseName.01402:_parallel_motion:_walden_pond,_concord_/_central_park,_new_york=01402: Parallel Motion: Walden Pond, Concord / Central Park, New York
+controlledvocabulary.gsdCourseName.01402:_parallel_motion:_walden_pond,_concord/_central_park_,_ny=01402: Parallel Motion: Walden Pond, Concord/ Central Park , NY
+controlledvocabulary.gsdCourseName.01402:_the_endless_landscape_-_river_hudson=01402: The Endless Landscape - River Hudson
+controlledvocabulary.gsdCourseName.01403:_after_la_villette=01403: After La Villette
+controlledvocabulary.gsdCourseName.01403:_after_la_vilette_(paris)=01403: After La Vilette (Paris)
+controlledvocabulary.gsdCourseName.01403:_life-styled_-_china-town=01403: LIFE-STYLED - CHINA-TOWN
+controlledvocabulary.gsdCourseName.01404:_california_limnolarium=01404: California Limnolarium
+controlledvocabulary.gsdCourseName.01404:_california_limnolarium_(experiments_in_projective_processes)=01404: California Limnolarium (experiments in projective processes)
+controlledvocabulary.gsdCourseName.01404:_post-suburb_-_nashua_nh=01404: Post-suburb - Nashua NH
+controlledvocabulary.gsdCourseName.01405:_airport_park_zurich=01405: Airport Park Zurich
+controlledvocabulary.gsdCourseName.01405:_envisioning_miami:_simulated_natures=01405: Envisioning Miami: Simulated Natures
+controlledvocabulary.gsdCourseName.01406:_the_ocean_state=01406: The Ocean State
+controlledvocabulary.gsdCourseName.01407:_from_the_city_to_the_object:_terre_des_hommes_2017=01407: From the City to the Object: Terre des Hommes 2017
+controlledvocabulary.gsdCourseName.01408:_caen_island:_public_space=01408: Caen Island: Public Space
+controlledvocabulary.gsdCourseName.01409:_negative_planning_in_nanshahe,_haidian_district,_beijing=01409: Negative Planning in Nanshahe, Haidian District, Beijing
+controlledvocabulary.gsdCourseName.01501:_haters_make_me_famous:_the_newark_riverfront_and_the_post-great_migration_city=01501: Haters Make Me Famous: The Newark Riverfront and the Post-Great Migration City
+controlledvocabulary.gsdCourseName.01501:_rurban=01501: RURBAN
+controlledvocabulary.gsdCourseName.01502:_networked_urbanism:_urban_waste_-_urban_design=01502: Networked Urbanism: Urban Waste - Urban Design
+controlledvocabulary.gsdCourseName.01502:_the_storm,_the_strife,_and_everyday_life=01502: The Storm, the Strife, and Everyday Life
+controlledvocabulary.gsdCourseName.01503:_planning_and_development_on_the_east_boston_waterfront=01503: Planning and Development on the East Boston Waterfront
+controlledvocabulary.gsdCourseName.01503:_the_countryside_as_a_city=01503: The Countryside as a City
+controlledvocabulary.gsdCourseName.01504:_retrofitting_the_(post?)_industrial_metropolis=01504: Retrofitting the (post?) Industrial Metropolis
+controlledvocabulary.gsdCourseName.01505:_medellin:_urban_porosity_as_social_infrastructure=01505: Medellin: Urban Porosity as Social Infrastructure
+controlledvocabulary.gsdCourseName.01506:_obsolescence_and_pathways_to_redevelopment:=01506: Obsolescence and Pathways to Redevelopment:
+controlledvocabulary.gsdCourseName.01507:_design_and_politics_-_managing_risks_and_vulnerabilities=01507: Design and Politics - Managing Risks and Vulnerabilities
+controlledvocabulary.gsdCourseName.01601:_macau:_cross-border_cities=01601: Macau: Cross-border Cities
+controlledvocabulary.gsdCourseName.01602:_territorialism_ii=01602: Territorialism II
+controlledvocabulary.gsdCourseName.01603:_meydan:_designing_the_surfaces_of_public_space_around_beyazit_square,_istanbul=01603: Meydan: Designing the Surfaces of Public Space around Beyazit Square, Istanbul
+controlledvocabulary.gsdCourseName.01606:_los_angeles_study_abroad_studio:_the_possibilities_of_the_wrong_scale=01606: Los Angeles Study Abroad Studio: The Possibilities of the Wrong Scale
+controlledvocabulary.gsdCourseName.02121:_visual_studies=02121: Visual Studies
+controlledvocabulary.gsdCourseName.02122:_projective_representation_in_architecture=02122: Projective Representation in Architecture
+controlledvocabulary.gsdCourseName.02129:_spatial_analysis_and_representation=02129: Spatial Analysis and Representation
+controlledvocabulary.gsdCourseName.02141:_landscape_representation_i=02141: Landscape Representation I
+controlledvocabulary.gsdCourseName.02142:_landscape_representation_i=02142: Landscape Representation I
+controlledvocabulary.gsdCourseName.02223:_digital_media_i=02223: Digital Media I
+controlledvocabulary.gsdCourseName.02224:_digital_media_ii=02224: Digital Media II
+controlledvocabulary.gsdCourseName.02241:_landscape_representation_ii=02241: Landscape Representation II
+controlledvocabulary.gsdCourseName.02241:_landscape_representation_iii=02241: Landscape Representation III
+controlledvocabulary.gsdCourseName.02322:_digital_media_for_design=02322: Digital Media for Design
+controlledvocabulary.gsdCourseName.02341:_communication_for_designer=02341: Communication for Designer
+controlledvocabulary.gsdCourseName.02415:_paper_or_plastic=02415: Paper or Plastic
+controlledvocabulary.gsdCourseName.02444:_landscape_material_design_practice_and_digital_media=02444: Landscape Material Design Practice and Digital Media
+controlledvocabulary.gsdCourseName.02446:_drawing_for_designers=02446: Drawing for Designers
+controlledvocabulary.gsdCourseName.02448:_landscape_as_painting=02448: Landscape as Painting
+controlledvocabulary.gsdCourseName.02449:_immersive_landscape=02449: Immersive Landscape
+controlledvocabulary.gsdCourseName.02449:_landscape_as_video_game=02449: Landscape as Video Game
+controlledvocabulary.gsdCourseName.02450:_landscape_as_weather/atmosphere=02450: Landscape as Weather/Atmosphere
+controlledvocabulary.gsdCourseName.02482:_art,_design_and_the_public_domain=02482: Art, Design and the Public Domain
+controlledvocabulary.gsdCourseName.02602:_basel_study_abroad_seminar=02602: Basel Study Abroad Seminar
+controlledvocabulary.gsdCourseName.03241:_theories_of_landscape_as_urbanism=03241: Theories of Landscape as Urbanism
+controlledvocabulary.gsdCourseName.03241:_theories_of_landscape_as_urbanism,_landscape_as_infrastructure=03241: Theories of Landscape as Urbanism, Landscape as Infrastructure
+controlledvocabulary.gsdCourseName.03242:_theories_of_landscape_architecture=03242: Theories of Landscape Architecture
+controlledvocabulary.gsdCourseName.03330:_conservation_of_older_buildings=03330: Conservation of Older Buildings
+controlledvocabulary.gsdCourseName.03333:_culture,_conservation_and_design=03333: Culture, Conservation and Design
+controlledvocabulary.gsdCourseName.03338:_carbonurbanism=03338: carbonurbanism
+controlledvocabulary.gsdCourseName.03345:_emergence_in_landscape_architecture=03345: Emergence in Landscape Architecture
+controlledvocabulary.gsdCourseName.03375:_planning_for_conservation:=03375: Planning for Conservation:
+controlledvocabulary.gsdCourseName.03453:_light_structure_i=03453: Light Structure I
+controlledvocabulary.gsdCourseName.03494:_design_for_learning=03494: Design for Learning
+controlledvocabulary.gsdCourseName.03499:_the_aperture_analyzed=03499: The Aperture Analyzed
+controlledvocabulary.gsdCourseName.03602:_study_abroad_seminar:_islands=03602: Study Abroad Seminar: Islands
+controlledvocabulary.gsdCourseName.03603:_the_hitchhikers_guide_to_hyperreality=03603: The Hitchhikers Guide to Hyperreality
+controlledvocabulary.gsdCourseName.04105:_studies_of_the_built_north_american_environment=04105: Studies of the Built North American Environment
+controlledvocabulary.gsdCourseName.04105:_studies_of_the_built_north_american_environment_1580_-_present=04105: Studies of the Built North American Environment 1580 - Present
+controlledvocabulary.gsdCourseName.04115:_history_and_theory_of_urban_interventions=04115: History and Theory of Urban Interventions
+controlledvocabulary.gsdCourseName.04121:_buildings,_texts,_and_contexts_i=04121: Buildings, Texts, and Contexts I
+controlledvocabulary.gsdCourseName.04141:_histories_of_landscape_architecture=04141: Histories of Landscape Architecture
+controlledvocabulary.gsdCourseName.04142:_histories_of_landscape_architecture_ii=04142: Histories of Landscape Architecture II
+controlledvocabulary.gsdCourseName.04223:_buildings,_texts,_and_contexts_iii=04223: Buildings, Texts, and Contexts III
+controlledvocabulary.gsdCourseName.04303:_modernization_in_the_visual_u.s._environment=04303: Modernization in the Visual U.S. Environment
+controlledvocabulary.gsdCourseName.04304:_north_american_seacoasts_+_landscapes_discovery_period_to_the_present=04304: North American Seacoasts + Landscapes Discovery Period to the Present
+controlledvocabulary.gsdCourseName.04304:_north_american_seacoasts_and_landscape=04304: North American Seacoasts and Landscape
+controlledvocabulary.gsdCourseName.04305:_adventure_+_fantasy_simulation_1871-2036=04305: Adventure + Fantasy Simulation 1871-2036
+controlledvocabulary.gsdCourseName.04329:_urbanization_in_the_east_asian_region=04329: Urbanization in the East Asian Region
+controlledvocabulary.gsdCourseName.04358:_authority_and_invention:_medieval_art_and_architecture=04358: Authority and Invention: Medieval Art and Architecture
+controlledvocabulary.gsdCourseName.04362:_structuring_urban_experience=04362: Structuring Urban Experience
+controlledvocabulary.gsdCourseName.04363:_walking=04363: Walking
+controlledvocabulary.gsdCourseName.04405:_istanbul=04405: Istanbul
+controlledvocabulary.gsdCourseName.04408:_situating_the_modern=04408: Situating the Modern
+controlledvocabulary.gsdCourseName.04439:_"in_the_manner_of_a_picture"=04439: "In the Manner of a Picture"
+controlledvocabulary.gsdCourseName.04444:_historical_ground=04444: Historical Ground
+controlledvocabulary.gsdCourseName.04445:_envisioning_landscape:_cultures_of_vision_in_the_air_and_on_the_ground=04445: Envisioning Landscape: Cultures of Vision in the Air and on the Ground
+controlledvocabulary.gsdCourseName.04446:_a_history_of_nature_conservation_and_cultural_landscape_preservation=04446: A History of Nature Conservation and Cultural Landscape Preservation
+controlledvocabulary.gsdCourseName.04447:_forest,_grove,_tree=04447: Forest, Grove, Tree
+controlledvocabulary.gsdCourseName.04477:_slums_in_architectural_history=04477: Slums in Architectural History
+controlledvocabulary.gsdCourseName.05204:_real_estate_finance_and_development=05204: Real Estate Finance and Development
+controlledvocabulary.gsdCourseName.05206:_land_use_and_environmental_law=05206: Land Use and Environmental Law
+controlledvocabulary.gsdCourseName.05210:_cities_by_design_i=05210: Cities by Design I
+controlledvocabulary.gsdCourseName.05212:_field_studies_in_real_estate,_planning,_and_urban_design=05212: Field Studies in Real Estate, Planning, and Urban Design
+controlledvocabulary.gsdCourseName.05213:_policy_making_in_urban_settings=05213: Policy Making in Urban Settings
+controlledvocabulary.gsdCourseName.05222:_markets_and_market_failures_with_cases=05222: Markets and Market Failures with Cases
+controlledvocabulary.gsdCourseName.05304:_transportation_planning_and_development=05304: Transportation Planning and Development
+controlledvocabulary.gsdCourseName.05326:_housing_and_urbanization_in_the_united_states=05326: Housing and Urbanization in the United States
+controlledvocabulary.gsdCourseName.05330:_healthy_places=05330: Healthy Places
+controlledvocabulary.gsdCourseName.05338:_planning_for_the_21st_century=05338: Planning for the 21st Century
+controlledvocabulary.gsdCourseName.05342:_creating_resilient_cities=05342: Creating Resilient Cities
+controlledvocabulary.gsdCourseName.05343:_critical_and_social_cartography=05343: Critical and Social Cartography
+controlledvocabulary.gsdCourseName.05360:_territorial_intelligence=05360: Territorial Intelligence
+controlledvocabulary.gsdCourseName.05433:_modern_housing_and_urban_districts=05433: Modern Housing and Urban Districts
+controlledvocabulary.gsdCourseName.05492:_real_estate_finance_and_development_fundamentals_=05492: Real Estate Finance and Development Fundamentals
+controlledvocabulary.gsdCourseName.05495:_market_analysis_and_urban_economics=05495: Market Analysis and Urban Economics
+controlledvocabulary.gsdCourseName.05502:_urban_governance_and_the_politics_of_planning_in_the_developing_world=05502: Urban Governance and the Politics of Planning in the Developing World
+controlledvocabulary.gsdCourseName.06121_construction_lab=06121 Construction Lab
+controlledvocabulary.gsdCourseName.06122_energy_in_architecture=06122 Energy in Architecture
+controlledvocabulary.gsdCourseName.06141:_ecologies,_techniques,_technologies_i=06141: Ecologies, Techniques, Technologies I
+controlledvocabulary.gsdCourseName.06141:_ecologies,_techniques,_techs._i=06141: Ecologies, Techniques, Techs. I
+controlledvocabulary.gsdCourseName.06142:_ecologies,_techniques,_techs._ii=06142: Ecologies, Techniques, Techs. II
+controlledvocabulary.gsdCourseName.06227:_structural_design_1=06227: Structural Design 1
+controlledvocabulary.gsdCourseName.06230:_cases_in_contemporary_construction=06230: Cases in Contemporary Construction
+controlledvocabulary.gsdCourseName.06241:_ecologies,_techniques,_technologies_iii=06241: Ecologies, Techniques, Technologies III
+controlledvocabulary.gsdCourseName.06241:_ecologies,_techniques,_techs._iii=06241: Ecologies, Techniques, Techs. III
+controlledvocabulary.gsdCourseName.06242:_ecologies,_techniques,_techs._iv=06242: Ecologies, Techniques, Techs. IV
+controlledvocabulary.gsdCourseName.06243:_ecologies,_techniques,_techs._v=06243: Ecologies, Techniques, Techs. V
+controlledvocabulary.gsdCourseName.06251:_research_seminar_on_urban_ecology=06251: Research Seminar on Urban Ecology
+controlledvocabulary.gsdCourseName.06271:_the_innovative_practice=06271: The Innovative Practice
+controlledvocabulary.gsdCourseName.06272:_innovation_in_science_and_engineering=06272: Innovation in Science and Engineering
+controlledvocabulary.gsdCourseName.06273:_water_engineering=06273: Water Engineering
+controlledvocabulary.gsdCourseName.06274:_advanced_introduction_to_robotics=06274: Advanced Introduction to Robotics
+controlledvocabulary.gsdCourseName.06275:_computer_vision_=06275: Computer Vision
+controlledvocabulary.gsdCourseName.06317:_material_practice_as_research=06317: Material Practice as Research
+controlledvocabulary.gsdCourseName.06318:_urban_and_suburban_ecology=06318: Urban and Suburban Ecology
+controlledvocabulary.gsdCourseName.06322:_mapping:_geographic_representation=06322: Mapping: Geographic Representation
+controlledvocabulary.gsdCourseName.06323:_brownfields_practicum=06323: Brownfields Practicum
+controlledvocabulary.gsdCourseName.06333:_aquatic_ecology=06333: Aquatic Ecology
+controlledvocabulary.gsdCourseName.06335:_phytotechnologies=06335: Phytotechnologies
+controlledvocabulary.gsdCourseName.06337:_changing_natural_and_built_coastal_environments=06337: Changing Natural and Built Coastal Environments
+controlledvocabulary.gsdCourseName.06337:_changing_natural_and_built_coastal_environments=06337: Changing Natural and Built Coastal Environments
+controlledvocabulary.gsdCourseName.06338:_introduction_to_computational_design=06338: Introduction to Computational Design
+controlledvocabulary.gsdCourseName.06436:_expanded_mechanisms_/_empirical_materialisms=06436: Expanded Mechanisms / Empirical Materialisms
+controlledvocabulary.gsdCourseName.06450:_high_performance_buildings_and_systems_integration=06450: High Performance Buildings and Systems Integration
+controlledvocabulary.gsdCourseName.06451:_research_seminar_on_urban_ecology=06451: Research Seminar on Urban Ecology
+controlledvocabulary.gsdCourseName.06454:_poetics_of_construction:_detail_design=06454: Poetics of Construction: Detail Design
+controlledvocabulary.gsdCourseName.06468:_design_by_committee=06468: Design By Committee
+controlledvocabulary.gsdCourseName.06470:_energy_simulation_for_design=06470: Energy Simulation for Design
+controlledvocabulary.gsdCourseName.06474:_natural_ventilation=06474: Natural Ventilation
+controlledvocabulary.gsdCourseName.06478:_informal_robotics=06478: Informal Robotics
+controlledvocabulary.gsdCourseName.06479:_daylighting=06479: Daylighting
+controlledvocabulary.gsdCourseName.07241:_practices_of_la=07241: Practices of LA
+controlledvocabulary.gsdCourseName.07241:_practices_of_landscape_architecture=07241: Practices of Landscape Architecture
+controlledvocabulary.gsdCourseName.07408:_frameworks_of_contemporary_practice=07408: Frameworks of Contemporary Practice
+controlledvocabulary.gsdCourseName.07410:_the_architect_in_history=07410: The Architect in History
+controlledvocabulary.gsdCourseName.09123:_the_fourth_typology=09123: The Fourth Typology
+controlledvocabulary.gsdCourseName.09123:_the_fourth_typology:_dominant_type_+_the_idea_of_the_city=09123: The Fourth Typology: Dominant Type + the Idea of the City
+controlledvocabulary.gsdCourseName.09127:_real_estate_and_city_making_in_china=09127: Real Estate and City Making in China
+controlledvocabulary.gsdCourseName.09131:_cultivating_scale:_territorial_planting_strategies=09131: Cultivating Scale: Territorial Planting Strategies
+controlledvocabulary.gsdCourseName.09136:_teaching_creativity=09136: Teaching Creativity
+controlledvocabulary.gsdCourseName.09137:_mapping_cultural_space=09137: Mapping Cultural Space
+controlledvocabulary.gsdCourseName.09201:_independent_study__masters_degrees=09201: Independent Study  Masters Degrees
+controlledvocabulary.gsdCourseName.09204:_preparation_for_independent_thesis_proposal_for_mup,_maud,_or_mlaud=09204: Preparation for Independent Thesis Proposal for MUP, MAUD, or MLAUD
+controlledvocabulary.gsdCourseName.09204:_thesis_prep_for_mup,_maud,_or_mlaud=09204: Thesis Prep for MUP, MAUD, or MLAUD
+controlledvocabulary.gsdCourseName.09301:_independent_thesis_in_satisfaction_of_degree_march=09301: Independent Thesis in Satisfaction of Degree MArch
+controlledvocabulary.gsdCourseName.09302:_independent_thesis_in_satisfaction_of_the_degree_maud,_mlaud,_or_mup=09302: Independent Thesis in Satisfaction of the Degree MAUD, MLAUD, or MUP
+controlledvocabulary.gsdCourseName.09304:_independent_thesis_for_mdes=09304: Independent Thesis for Mdes
+controlledvocabulary.gsdCourseName.09304:_independent_thesis_for_the_degree_master_in_design_studies=09304: Independent Thesis for the Degree Master in Design Studies
+controlledvocabulary.gsdCourseName.09305:_master_of_design_studies_final_project=09305: Master of Design Studies Final Project
+controlledvocabulary.gsdCourseName.09341:_preparation_of_design_thesis_proposal_for_mla=09341: Preparation of Design Thesis Proposal for MLA
+controlledvocabulary.gsdCourseName.09341:_thesis_prep_for_mla=09341: Thesis Prep for MLA
+controlledvocabulary.gsdCourseName.09342:_independent_thesis=09342: Independent Thesis
+controlledvocabulary.gsdCourseName.09342:_independent_thesis_in_satisfaction_of_the_degree_mla=09342: Independent Thesis in Satisfaction of the Degree MLA
+controlledvocabulary.gsdCourseName.09503:_preparation_of_doctoral_thesis_proposal=09503: Preparation of Doctoral Thesis Proposal
+controlledvocabulary.gsdCourseName.09504:_thesis_in_satisfaction_of_the_degree_doctor_of_design=09504: Thesis in Satisfaction of the Degree Doctor of Design
+controlledvocabulary.gsdCourseName.09506:_thesis_extension_in_satisfaction_of_degree_doctor_of_design=09506: Thesis Extension in Satisfaction of Degree Doctor of Design
+controlledvocabulary.gsdCourseName.09601:_march_ii_proseminar=09601: MArch II Proseminar
+controlledvocabulary.gsdCourseName.09630:_urban_design_proseminar=09630: Urban Design Proseminar
+controlledvocabulary.gsdCourseName.09641:_mla_proseminar=09641: MLA Proseminar
+controlledvocabulary.gsdCourseName.09641:_proseminar_in_landscape_architecture=09641: Proseminar in Landscape Architecture
+controlledvocabulary.gsdCourseName.09661:_proseminar_in_urbanism,_landscape,_ecology=09661: Proseminar in Urbanism, Landscape, Ecology
+controlledvocabulary.gsdCourseName.09663:_risk_and_resilience_proseminar=09663: Risk and Resilience Proseminar
+controlledvocabulary.gsdCourseName.09691:_doctoral_program_proseminar=09691: Doctoral Program Proseminar
+controlledvocabulary.gsdCourseName.other=Other
\ No newline at end of file
diff --git a/src/main/java/customMRA.properties b/src/main/java/customMRA.properties
new file mode 100644
index 00000000000..8d905d266f0
--- /dev/null
+++ b/src/main/java/customMRA.properties
@@ -0,0 +1,16 @@
+metadatablock.name=customMRA
+metadatablock.displayName=MRA Metadata
+datasetfieldtype.mraCollection.title=Murray Research Archive Collection
+datasetfieldtype.mraCollection.description=Browse the Murray Research Archive collection with the following terms.
+datasetfieldtype.mraCollection.watermark=
+controlledvocabulary.mraCollection.diversity_samples:_race,_ethnicity,_sexual_orientation,_religion=Diversity samples: Race, Ethnicity, Sexual Orientation, Religion
+controlledvocabulary.mraCollection.early_head_start_research_and_evaluation_project,_1996_-_2001=Early Head Start Research and Evaluation Project, 1996 - 2001
+controlledvocabulary.mraCollection.economic_theory_and_demography=Economic Theory and Demography
+controlledvocabulary.mraCollection.education=Education
+controlledvocabulary.mraCollection.family._marriage._women=Family. Marriage. Women
+controlledvocabulary.mraCollection.health=Health
+controlledvocabulary.mraCollection.politics_and_government=Politics and Government
+controlledvocabulary.mraCollection.replications,_extensions_and_followups=Replications, Extensions and Followups
+controlledvocabulary.mraCollection.studies_with_audio_data=Studies with Audio Data
+controlledvocabulary.mraCollection.studies_with_video_data=Studies with Video Data
+controlledvocabulary.mraCollection.work=Work
\ No newline at end of file
diff --git a/src/main/java/customPSI.properties b/src/main/java/customPSI.properties
new file mode 100644
index 00000000000..e72e4e50222
--- /dev/null
+++ b/src/main/java/customPSI.properties
@@ -0,0 +1,120 @@
+metadatablock.name=customPSI
+metadatablock.displayName=PSI Metadata
+datasetfieldtype.psiBehavior.title=Behavior
+datasetfieldtype.psiDonor.title=Donor
+datasetfieldtype.psiHealthArea.title=Health Area
+datasetfieldtype.psiIntervention.title=Intervention
+datasetfieldtype.psiPopulation.title=Population
+datasetfieldtype.psiProductsServices.title=Products/Services
+datasetfieldtype.psiStudyDesignElement.title=Study Design Element
+datasetfieldtype.psiStudyType.title=Study Type
+datasetfieldtype.psiBehavior.description=Behavior
+datasetfieldtype.psiDonor.description=Donor
+datasetfieldtype.psiHealthArea.description=Health Area
+datasetfieldtype.psiIntervention.description=Intervention
+datasetfieldtype.psiPopulation.description=Population
+datasetfieldtype.psiProductsServices.description=Products/Services
+datasetfieldtype.psiStudyDesignElement.description=Study Design Element
+datasetfieldtype.psiStudyType.description=Study Type
+datasetfieldtype.psiBehavior.watermark=
+datasetfieldtype.psiDonor.watermark=
+datasetfieldtype.psiHealthArea.watermark=
+datasetfieldtype.psiIntervention.watermark=
+datasetfieldtype.psiPopulation.watermark=
+datasetfieldtype.psiProductsServices.watermark=
+datasetfieldtype.psiStudyDesignElement.watermark=
+datasetfieldtype.psiStudyType.watermark=
+controlledvocabulary.psiBehavior.abstinence=Abstinence
+controlledvocabulary.psiBehavior.birth_spacing=Birth spacing
+controlledvocabulary.psiBehavior.cervical_cancer_screening=Cervical cancer screening
+controlledvocabulary.psiBehavior.condom_use=Condom use
+controlledvocabulary.psiBehavior.fgm=FGM
+controlledvocabulary.psiBehavior.hiv_risk_behaviors=HIV risk behaviors
+controlledvocabulary.psiBehavior.hiv/sti_testing=HIV/STI testing
+controlledvocabulary.psiBehavior.llin_use=LLIN use
+controlledvocabulary.psiBehavior.male_circumcision=Male circumcision
+controlledvocabulary.psiBehavior.modern_contraceptive_use=Modern contraceptive use
+controlledvocabulary.psiBehavior.ors_use=ORS use
+controlledvocabulary.psiBehavior.partner_reduction=Partner reduction
+controlledvocabulary.psiBehavior.referral_uptake=Referral uptake
+controlledvocabulary.psiBehavior.treatment_adherence=Treatment adherence
+controlledvocabulary.psiBehavior.water_treatment=Water treatment
+controlledvocabulary.psiDonor.cdc=CDC
+controlledvocabulary.psiDonor.dfid=DFID
+controlledvocabulary.psiDonor.dutch=Dutch
+controlledvocabulary.psiDonor.gates_foundation=Gates Foundation
+controlledvocabulary.psiDonor.global_fund=Global Fund
+controlledvocabulary.psiDonor.kfw=KfW
+controlledvocabulary.psiDonor.lad=LAD
+controlledvocabulary.psiDonor.other=Other
+controlledvocabulary.psiDonor.pepfar=PEPFAR
+controlledvocabulary.psiDonor.unfpa=UNFPA
+controlledvocabulary.psiDonor.usaid=USAID
+controlledvocabulary.psiHealthArea.diarrhea=Diarrhea
+controlledvocabulary.psiHealthArea.gbv=GBV
+controlledvocabulary.psiHealthArea.hiv=HIV
+controlledvocabulary.psiHealthArea.icm=ICM
+controlledvocabulary.psiHealthArea.malaria=Malaria
+controlledvocabulary.psiHealthArea.ncds=NCDs
+controlledvocabulary.psiHealthArea.nutrition=Nutrition
+controlledvocabulary.psiHealthArea.pneumonia=Pneumonia
+controlledvocabulary.psiHealthArea.reproductive_health=Reproductive health
+controlledvocabulary.psiHealthArea.tb=TB
+controlledvocabulary.psiIntervention.bcc=BCC
+controlledvocabulary.psiIntervention.ipc=IPC
+controlledvocabulary.psiIntervention.medical_detailing=Medical detailing
+controlledvocabulary.psiIntervention.mhealth=mHealth
+controlledvocabulary.psiIntervention.provider_training=Provider training
+controlledvocabulary.psiIntervention.social_franchising=Social franchising
+controlledvocabulary.psiPopulation.caregivers=Caregivers
+controlledvocabulary.psiPopulation.couples=Couples
+controlledvocabulary.psiPopulation.fsw=FSW
+controlledvocabulary.psiPopulation.general_population=General population
+controlledvocabulary.psiPopulation.idus=IDUs
+controlledvocabulary.psiPopulation.marps=MARPs
+controlledvocabulary.psiPopulation.men=Men
+controlledvocabulary.psiPopulation.msm=MSM
+controlledvocabulary.psiPopulation.plhiv=PLHIV
+controlledvocabulary.psiPopulation.providers=Providers
+controlledvocabulary.psiPopulation.truck_drivers=Truck drivers
+controlledvocabulary.psiPopulation.women=Women
+controlledvocabulary.psiPopulation.wra=WRA
+controlledvocabulary.psiPopulation.youth=Youth
+controlledvocabulary.psiProductsServices.act=ACT
+controlledvocabulary.psiProductsServices.anc=ANC
+controlledvocabulary.psiProductsServices.antibiotics=Antibiotics
+controlledvocabulary.psiProductsServices.art=ART
+controlledvocabulary.psiProductsServices.clean_delivery_kit=Clean delivery kit
+controlledvocabulary.psiProductsServices.condoms=Condoms
+controlledvocabulary.psiProductsServices.household_water_treatment=Household water treatment
+controlledvocabulary.psiProductsServices.htc=HTC
+controlledvocabulary.psiProductsServices.llin=LLIN
+controlledvocabulary.psiProductsServices.long-term_methods=Long-term Methods
+controlledvocabulary.psiProductsServices.medicated_abortion=Medicated Abortion
+controlledvocabulary.psiProductsServices.misoprostol=Misoprostol
+controlledvocabulary.psiProductsServices.multivitamin=Multivitamin
+controlledvocabulary.psiProductsServices.needle_and_syringe=Needle and syringe
+controlledvocabulary.psiProductsServices.nevirapine=Nevirapine
+controlledvocabulary.psiProductsServices.ors=ORS
+controlledvocabulary.psiProductsServices.pmtct=PMTCT
+controlledvocabulary.psiProductsServices.short-term_methods=Short-term methods
+controlledvocabulary.psiProductsServices.sti_kit=STI kit
+controlledvocabulary.psiProductsServices.tb_dots=TB DOTS
+controlledvocabulary.psiProductsServices.vmc=VMC
+controlledvocabulary.psiProductsServices.zinc=Zinc
+controlledvocabulary.psiStudyDesignElement.cem=CEM
+controlledvocabulary.psiStudyDesignElement.client_exit_interview=Client exit interview
+controlledvocabulary.psiStudyDesignElement.control_group=Control group
+controlledvocabulary.psiStudyDesignElement.cross-sectional=Cross-sectional
+controlledvocabulary.psiStudyDesignElement.focus_group=Focus group
+controlledvocabulary.psiStudyDesignElement.in-depth_interview=In-depth interview
+controlledvocabulary.psiStudyDesignElement.longitudinal=Longitudinal
+controlledvocabulary.psiStudyDesignElement.lqas=LQAS
+controlledvocabulary.psiStudyDesignElement.mystery_client=Mystery client
+controlledvocabulary.psiStudyDesignElement.pretesting=Pretesting
+controlledvocabulary.psiStudyDesignElement.trac=TRaC
+controlledvocabulary.psiStudyType.map=MAP
+controlledvocabulary.psiStudyType.mixed_methods=Mixed Methods
+controlledvocabulary.psiStudyType.qualitative=Qualitative
+controlledvocabulary.psiStudyType.quantitative=Quantitative
+controlledvocabulary.psiStudyType.retail_audit=Retail audit
\ No newline at end of file
diff --git a/src/main/java/customPSRI.properties b/src/main/java/customPSRI.properties
new file mode 100644
index 00000000000..61370bb9fd1
--- /dev/null
+++ b/src/main/java/customPSRI.properties
@@ -0,0 +1,58 @@
+metadatablock.name=customPSRI
+metadatablock.displayName=Political Science Replication Initiative Metadata
+datasetfieldtype.PSRI1.title=Are the original data publicly available?
+datasetfieldtype.PSRI2.title=Is the original code available?
+datasetfieldtype.PSRI3.title=Where are the original data archived (name and url)?
+datasetfieldtype.PSRI4.title=Where is the original code publicly archived (name and url)?
+datasetfieldtype.PSRI5.title=Will you submit your replication code to this Dataverse (This is a PSRI requirement)?
+datasetfieldtype.PSRI6.title=Will you submit your replication write-up to this Dataverse (This is a PSRI requirement)?
+datasetfieldtype.PSRI7.title=Did you send the replication materials to the original author(s) and notify them that you'd be posting your replication on PSRI?
+datasetfieldtype.PSRI8.title=Was the replication done in a course? (If so, please continue to answer the subsequent questions, and if not, select N/A)
+datasetfieldtype.PSRI9.title=Did another student attempt to replicate the replication in the class?
+datasetfieldtype.PSRI10.title=Did another student replicate this replication successfully?
+datasetfieldtype.PSRI11.title=Did a professor read/review a draft before the final version?
+datasetfieldtype.PSRI1.description=Select from the list of options.
+datasetfieldtype.PSRI2.description=Select from the list of options.
+datasetfieldtype.PSRI3.description=Answer if the data are publicly available.
+datasetfieldtype.PSRI4.description=Answer if the code is publicly available.
+datasetfieldtype.PSRI5.description=Select from the list of options.
+datasetfieldtype.PSRI6.description=Select from the list of options.
+datasetfieldtype.PSRI7.description=Select from the list of options.
+datasetfieldtype.PSRI8.description=Select from the list of options.
+datasetfieldtype.PSRI9.description=Select from the list of options.
+datasetfieldtype.PSRI10.description=Select from the list of options.
+datasetfieldtype.PSRI11.description=Select from the list of options.
+datasetfieldtype.PSRI1.watermark=
+datasetfieldtype.PSRI2.watermark=
+datasetfieldtype.PSRI3.watermark=
+datasetfieldtype.PSRI4.watermark=
+datasetfieldtype.PSRI5.watermark=
+datasetfieldtype.PSRI6.watermark=
+datasetfieldtype.PSRI7.watermark=
+datasetfieldtype.PSRI8.watermark=
+datasetfieldtype.PSRI9.watermark=
+datasetfieldtype.PSRI10.watermark=
+datasetfieldtype.PSRI11.watermark=
+controlledvocabulary.PSRI1.no=No
+controlledvocabulary.PSRI1.yes=Yes
+controlledvocabulary.PSRI2.no=No
+controlledvocabulary.PSRI2.yes=Yes
+controlledvocabulary.PSRI2.na=NA
+controlledvocabulary.PSRI5.no=No
+controlledvocabulary.PSRI5.yes=Yes
+controlledvocabulary.PSRI6.no=No
+controlledvocabulary.PSRI6.yes=Yes
+controlledvocabulary.PSRI7.no=No
+controlledvocabulary.PSRI7.yes=Yes
+controlledvocabulary.PSRI8.no=No
+controlledvocabulary.PSRI8.yes=Yes
+controlledvocabulary.PSRI8.na=NA
+controlledvocabulary.PSRI9.na=NA
+controlledvocabulary.PSRI9.no=No
+controlledvocabulary.PSRI9.yes=Yes
+controlledvocabulary.PSRI10.na=NA
+controlledvocabulary.PSRI10.no=No
+controlledvocabulary.PSRI10.yes=Yes
+controlledvocabulary.PSRI11.na=NA
+controlledvocabulary.PSRI11.no=No
+controlledvocabulary.PSRI11.yes=Yes
\ No newline at end of file
diff --git a/src/main/java/custom_hbgdki.properties b/src/main/java/custom_hbgdki.properties
new file mode 100644
index 00000000000..087c706d014
--- /dev/null
+++ b/src/main/java/custom_hbgdki.properties
@@ -0,0 +1,116 @@
+metadatablock.name=custom_hbgdki
+metadatablock.displayName=HBGDki Custom Metadata
+datasetfieldtype.hbgdkiStudyName.title=Name of Study
+datasetfieldtype.hbgdkiStudyRegistry.title=Study Registry
+datasetfieldtype.hbgdkiStudyRegistryType.title=ID Type
+datasetfieldtype.hbgdkiStudyRegistryNumber.title=ID Number
+datasetfieldtype.hbgdkiStudyType.title=Type of study
+datasetfieldtype.hbgdkiIntervention.title=Intervention
+datasetfieldtype.hbgdkiLowerLimitAge.title=Lower limit of age at enrollment
+datasetfieldtype.hbgdkiUnitsLowerLimitAge.title=Units for lower age limit
+datasetfieldtype.hbgdkiUpperLimitAge.title=Upper limit of age at enrollment
+datasetfieldtype.hbgdkiUnitsUpperLimitAge.title=Units for upper age limit
+datasetfieldtype.hbgdkiOther.title=Other entry criteria
+datasetfieldtype.hbgdkiBiosampleType.title=Types of biosamples collected, if any
+datasetfieldtype.hbgdkiGestationalAge.title=Gestational age
+datasetfieldtype.hbgdkiAnthropometry.title=Anthropometry
+datasetfieldtype.hbgdkiBirthWeight.title=Birth weight
+datasetfieldtype.hbgdkiNeurocognitiveDev.title=Neurocognitive development
+datasetfieldtype.hbgdkiMaternalChar.title=Maternal characteristics
+datasetfieldtype.hbgdkiPregnancyBirth.title=Pregnancy and birth
+datasetfieldtype.hbgdkiSocioeconomicChar.title=Socioeconomic characteristics
+datasetfieldtype.hbgdkiFeedingCare.title=Feeding care & practice
+datasetfieldtype.hbgdkiImmunizations.title=Immunizations
+datasetfieldtype.hbgdkiInfantChildhoodMorbidity.title=Morbidity in infancy and childhood
+datasetfieldtype.hbgdkiWaterSanHygiene.title=Water, sanitation and hygiene standards
+datasetfieldtype.hbgdkiStudyName.description=Name of the study.
+datasetfieldtype.hbgdkiStudyRegistry.description=Which study registry was used?
+datasetfieldtype.hbgdkiStudyRegistryType.description=Which study registry was used?
+datasetfieldtype.hbgdkiStudyRegistryNumber.description=ID number for the study per the registry.
+datasetfieldtype.hbgdkiStudyType.description=Type of study.
+datasetfieldtype.hbgdkiIntervention.description=If an interventional study, describe the interventions.
+datasetfieldtype.hbgdkiLowerLimitAge.description=Lower limit of age at enrollment.
+datasetfieldtype.hbgdkiUnitsLowerLimitAge.description=Units for lower age limit.
+datasetfieldtype.hbgdkiUpperLimitAge.description=Upper limit of age at enrollment.
+datasetfieldtype.hbgdkiUnitsUpperLimitAge.description=Units for upper age limit.
+datasetfieldtype.hbgdkiOther.description=Other entry criteria.
+datasetfieldtype.hbgdkiBiosampleType.description=Types of biosamples used (e.g., Blood, Stool,...).
+datasetfieldtype.hbgdkiGestationalAge.description=Gestational age
+datasetfieldtype.hbgdkiAnthropometry.description=Anthropometry
+datasetfieldtype.hbgdkiBirthWeight.description=Birth weight
+datasetfieldtype.hbgdkiNeurocognitiveDev.description=Neurocognitive development
+datasetfieldtype.hbgdkiMaternalChar.description=Dataset parameters can include: age, height, weight, obstetric history.
+datasetfieldtype.hbgdkiPregnancyBirth.description=Dataset parameters can include: Morbidity, nutrition, ANC, delivery method and setting.
+datasetfieldtype.hbgdkiSocioeconomicChar.description=Socioeconomic characteristics
+datasetfieldtype.hbgdkiFeedingCare.description=Feeding care & practice
+datasetfieldtype.hbgdkiImmunizations.description=Immunizations
+datasetfieldtype.hbgdkiInfantChildhoodMorbidity.description=Morbidity in infancy and childhood
+datasetfieldtype.hbgdkiWaterSanHygiene.description=Water, sanitation and hygiene standards
+datasetfieldtype.hbgdkiStudyName.watermark=Limit to 20 characters.
+datasetfieldtype.hbgdkiStudyRegistry.watermark=
+datasetfieldtype.hbgdkiStudyRegistryType.watermark=
+datasetfieldtype.hbgdkiStudyRegistryNumber.watermark=
+datasetfieldtype.hbgdkiStudyType.watermark=
+datasetfieldtype.hbgdkiIntervention.watermark=
+datasetfieldtype.hbgdkiLowerLimitAge.watermark=
+datasetfieldtype.hbgdkiUnitsLowerLimitAge.watermark=
+datasetfieldtype.hbgdkiUpperLimitAge.watermark=
+datasetfieldtype.hbgdkiUnitsUpperLimitAge.watermark=
+datasetfieldtype.hbgdkiOther.watermark=
+datasetfieldtype.hbgdkiBiosampleType.watermark=
+datasetfieldtype.hbgdkiGestationalAge.watermark=
+datasetfieldtype.hbgdkiAnthropometry.watermark=
+datasetfieldtype.hbgdkiBirthWeight.watermark=
+datasetfieldtype.hbgdkiNeurocognitiveDev.watermark=
+datasetfieldtype.hbgdkiMaternalChar.watermark=
+datasetfieldtype.hbgdkiPregnancyBirth.watermark=
+datasetfieldtype.hbgdkiSocioeconomicChar.watermark=
+datasetfieldtype.hbgdkiFeedingCare.watermark=
+datasetfieldtype.hbgdkiImmunizations.watermark=
+datasetfieldtype.hbgdkiInfantChildhoodMorbidity.watermark=
+datasetfieldtype.hbgdkiWaterSanHygiene.watermark=
+controlledvocabulary.hbgdkiStudyRegistryType.international_clinical_trials_registry_platform_(ictrp)=International Clinical Trials Registry Platform (ICTRP)
+controlledvocabulary.hbgdkiStudyRegistryType.australian_new_zealand_clinical_trials_registry_(anzctr)=Australian New Zealand Clinical Trials Registry (ANZCTR)
+controlledvocabulary.hbgdkiStudyRegistryType.brazilian_clinical_trials_registry_(rebec)=Brazilian Clinical Trials Registry (ReBec)
+controlledvocabulary.hbgdkiStudyRegistryType.chinese_clinical_trial_registry_(chictr)=Chinese Clinical Trial Registry (ChiCTR)
+controlledvocabulary.hbgdkiStudyRegistryType.clinical_research_information_service_(cris),_republic_of_korea=Clinical Research Information Service (CRiS), Republic of Korea
+controlledvocabulary.hbgdkiStudyRegistryType.clinical_trials_registry_-_india_(ctri)=Clinical Trials Registry - India (CTRI)
+controlledvocabulary.hbgdkiStudyRegistryType.cuban_public_registry_of_clinical_trials_(rpcec)=Cuban Public Registry of Clinical Trials (RPCEC)
+controlledvocabulary.hbgdkiStudyRegistryType.eu_clinical_trials_register_(eu-ctr)=EU Clinical Trials Register (EU-CTR)
+controlledvocabulary.hbgdkiStudyRegistryType.german_clinical_trials_register_(drks)=German Clinical Trials Register (DRKS)
+controlledvocabulary.hbgdkiStudyRegistryType.iranian_registry_of_clinical_trials_(irct)=Iranian Registry of Clinical Trials (IRCT)
+controlledvocabulary.hbgdkiStudyRegistryType.isrctn=ISRCTN
+controlledvocabulary.hbgdkiStudyRegistryType.japan_primary_registries_network_(jprn)=Japan Primary Registries Network (JPRN)
+controlledvocabulary.hbgdkiStudyRegistryType.pan_african_clinical_trial_registry_(pactr)=Pan African Clinical Trial Registry (PACTR)
+controlledvocabulary.hbgdkiStudyRegistryType.sri_lanka_clinical_trials_registry_(slctr)=Sri Lanka Clinical Trials Registry (SLCTR)
+controlledvocabulary.hbgdkiStudyRegistryType.thai_clinical_trials_registry_(tctr)=Thai Clinical Trials Registry (TCTR)
+controlledvocabulary.hbgdkiStudyRegistryType.the_netherlands_national_trial_register_(ntr)=The Netherlands National Trial Register (NTR)
+controlledvocabulary.hbgdkiStudyRegistryType.us_clinical_trials_registry_(clinicaltrials.gov)=US Clinical Trials Registry (clinicaltrials.gov)
+controlledvocabulary.hbgdkiStudyType.interventional=Interventional
+controlledvocabulary.hbgdkiStudyType.observational=Observational
+controlledvocabulary.hbgdkiStudyType.case_control=Case Control
+controlledvocabulary.hbgdkiStudyType.meta-analysis=Meta-analysis
+controlledvocabulary.hbgdkiStudyType.demographic_&_health_survey=Demographic & Health Survey
+controlledvocabulary.hbgdkiStudyType.other_survey=Other Survey
+controlledvocabulary.hbgdkiGestationalAge.yes=Yes
+controlledvocabulary.hbgdkiGestationalAge.no=No
+controlledvocabulary.hbgdkiAnthropometry.yes=Yes
+controlledvocabulary.hbgdkiAnthropometry.no=No
+controlledvocabulary.hbgdkiBirthWeight.yes=Yes
+controlledvocabulary.hbgdkiBirthWeight.no=No
+controlledvocabulary.hbgdkiNeurocognitiveDev.yes=Yes
+controlledvocabulary.hbgdkiNeurocognitiveDev.no=No
+controlledvocabulary.hbgdkiMaternalChar.yes=Yes
+controlledvocabulary.hbgdkiMaternalChar.no=No
+controlledvocabulary.hbgdkiPregnancyBirth.yes=Yes
+controlledvocabulary.hbgdkiPregnancyBirth.no=No
+controlledvocabulary.hbgdkiSocioeconomicChar.yes=Yes
+controlledvocabulary.hbgdkiSocioeconomicChar.no=No
+controlledvocabulary.hbgdkiFeedingCare.yes=Yes
+controlledvocabulary.hbgdkiFeedingCare.no=No
+controlledvocabulary.hbgdkiImmunizations.yes=Yes
+controlledvocabulary.hbgdkiImmunizations.no=No
+controlledvocabulary.hbgdkiInfantChildhoodMorbidity.yes=Yes
+controlledvocabulary.hbgdkiInfantChildhoodMorbidity.no=No
+controlledvocabulary.hbgdkiWaterSanHygiene.yes=Yes
+controlledvocabulary.hbgdkiWaterSanHygiene.no=No
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
index 5f29eca3bb9..98310a136b5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
@@ -2,11 +2,16 @@
 
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.io.InputStream;
 
 import javax.ejb.EJB;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 
 public abstract class AbstractGlobalIdServiceBean implements GlobalIdServiceBean {
 
@@ -65,6 +70,7 @@ protected Map addBasicMetadata(DvObject dvObjectIn, Map datafileIdentifiers;
+    private List creators;
+    private String title;
+    private String publisher;
+    private String publisherYear;
+    private List authors;
+    private String description;
+    private List contacts;
+    private List producers;
+
+    public List getProducers() {
+        return producers;
+    }
+
+    public void setProducers(List producers) {
+        this.producers = producers;
+    }
+
+    public List getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(List contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(List authors) {
+        this.authors = authors;
+    }
+
+
+    public List getDatafileIdentifiers() {
+        return datafileIdentifiers;
+    }
+
+    public void setDatafileIdentifiers(List datafileIdentifiers) {
+        this.datafileIdentifiers = datafileIdentifiers;
+    }
+
+    public GlobalIdMetadataTemplate(String xmlMetaData) {
+        this.xmlMetadata = xmlMetaData;
+        Document doc = Jsoup.parseBodyFragment(xmlMetaData);
+        Elements identifierElements = doc.select("identifier");
+        if (identifierElements.size() > 0) {
+            identifier = identifierElements.get(0).html();
+        }
+        Elements creatorElements = doc.select("creatorName");
+        creators = new ArrayList<>();
+        for (Element creatorElement : creatorElements) {
+            creators.add(creatorElement.html());
+        }
+        Elements titleElements = doc.select("title");
+        if (titleElements.size() > 0) {
+            title = titleElements.get(0).html();
+        }
+        Elements publisherElements = doc.select("publisher");
+        if (publisherElements.size() > 0) {
+            publisher = publisherElements.get(0).html();
+        }
+        Elements publisherYearElements = doc.select("publicationYear");
+        if (publisherYearElements.size() > 0) {
+            publisherYear = publisherYearElements.get(0).html();
+        }
+    }
+
+    public String generateXML(DvObject dvObject) {
+        // Can't use "UNKNOWN" here because DataCite will respond with "[facet 'pattern'] the value 'unknown' is not accepted by the pattern '[\d]{4}'"
+        String publisherYearFinal = "9999";
+        // FIXME: Investigate why this.publisherYear is sometimes null now that pull request #4606 has been merged.
+        if (this.publisherYear != null) {
+            // Added to prevent a NullPointerException when trying to destroy datasets when using DataCite rather than EZID.
+            publisherYearFinal = this.publisherYear;
+        }
+        xmlMetadata = template.replace("${identifier}", this.identifier.trim())
+                .replace("${title}", this.title)
+                .replace("${publisher}", this.publisher)
+                .replace("${publisherYear}", publisherYearFinal)
+                .replace("${description}", this.description);
+        StringBuilder creatorsElement = new StringBuilder();
+        for (DatasetAuthor author : authors) {
+            creatorsElement.append("");
+            creatorsElement.append(author.getName().getDisplayValue());
+            creatorsElement.append("");
+
+            if (author.getIdType() != null && author.getIdValue() != null && !author.getIdType().isEmpty() && !author.getIdValue().isEmpty() && author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
+
+                if (author.getIdType().equals("ORCID")) {
+                    creatorsElement.append("" + author.getIdValue() + "");
+                }
+                if (author.getIdType().equals("ISNI")) {
+                    creatorsElement.append("" + author.getIdValue() + "");
+                }
+                if (author.getIdType().equals("LCNA")) {
+                    creatorsElement.append("" + author.getIdValue() + "");
+                }
+            }
+            if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
+                creatorsElement.append("" + author.getAffiliation().getDisplayValue() + "");
+            }
+            creatorsElement.append("");
+        }
+        xmlMetadata = xmlMetadata.replace("${creators}", creatorsElement.toString());
+
+        StringBuilder contributorsElement = new StringBuilder();
+        for (String[] contact : this.getContacts()) {
+            if (!contact[0].isEmpty()) {
+                contributorsElement.append("" + contact[0] + "");
+                if (!contact[1].isEmpty()) {
+                    contributorsElement.append("" + contact[1] + "");
+                }
+                contributorsElement.append("");
+            }
+        }
+        for (String[] producer : this.getProducers()) {
+            contributorsElement.append("" + producer[0] + "");
+            if (!producer[1].isEmpty()) {
+                contributorsElement.append("" + producer[1] + "");
+            }
+            contributorsElement.append("");
+        }
+
+        String relIdentifiers = generateRelatedIdentifiers(dvObject);
+
+        xmlMetadata = xmlMetadata.replace("${relatedIdentifiers}", relIdentifiers);
+
+        xmlMetadata = xmlMetadata.replace("{$contributors}", contributorsElement.toString());
+        return xmlMetadata;
+    }
+
+    private String generateRelatedIdentifiers(DvObject dvObject) {
+
+        StringBuilder sb = new StringBuilder();
+        if (dvObject.isInstanceofDataset()) {
+            Dataset dataset = (Dataset) dvObject;
+            if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
+
+                datafileIdentifiers = new ArrayList<>();
+                for (DataFile dataFile : dataset.getFiles()) {
+                    if (!dataFile.getGlobalId().asString().isEmpty()) {
+                        if (sb.toString().isEmpty()) {
+                            sb.append("");
+                        }
+                        sb.append("" + dataFile.getGlobalId() + "");
+                    }
+                }
+
+                if (!sb.toString().isEmpty()) {
+                    sb.append("");
+                }
+            }
+        } else if (dvObject.isInstanceofDataFile()) {
+            DataFile df = (DataFile) dvObject;
+            sb.append("");
+            sb.append("" + df.getOwner().getGlobalId() + "");
+            sb.append("");
+        }
+        return sb.toString();
+    }
+
+    public void generateFileIdentifiers(DvObject dvObject) {
+
+        if (dvObject.isInstanceofDataset()) {
+            Dataset dataset = (Dataset) dvObject;
+
+            if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) {
+
+                datafileIdentifiers = new ArrayList<>();
+                for (DataFile dataFile : dataset.getFiles()) {
+                    datafileIdentifiers.add(dataFile.getIdentifier());
+                    int x = xmlMetadata.indexOf("") - 1;
+                    xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", dataFile.getIdentifier());
+                    xmlMetadata = xmlMetadata.substring(0, x) + "${relatedIdentifier}" + template.substring(x, template.length() - 1);
+
+                }
+
+            } else {
+                xmlMetadata = xmlMetadata.replace("${relatedIdentifier}", "");
+            }
+        }
+    }
+
+    public  String getTemplate() {
+        return template;
+    }
+
+    public  void setTemplate(String templateIn) {
+        template = templateIn;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public void setDatasetIdentifier(String datasetIdentifier) {
+        this.datasetIdentifier = datasetIdentifier;
+    }
+
+    public List getCreators() {
+        return creators;
+    }
+
+    public void setCreators(List creators) {
+        this.creators = creators;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(String publisher) {
+        this.publisher = publisher;
+    }
+
+    public String getPublisherYear() {
+        return publisherYear;
+    }
+
+    public void setPublisherYear(String publisherYear) {
+        this.publisherYear = publisherYear;
+    }
+}
+    public String getMetadataFromDvObject(String identifier, Map metadata, DvObject dvObject) {
+
+        Dataset dataset = null;
+
+        if (dvObject instanceof Dataset) {
+            dataset = (Dataset) dvObject;
+        } else {
+            dataset = (Dataset) dvObject.getOwner();
+        }
+
+        GlobalIdMetadataTemplate metadataTemplate = new GlobalIdMetadataTemplate();
+        metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1));
+        metadataTemplate.setCreators(Util.getListFromStr(metadata.get("datacite.creator")));
+        metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors());
+        if (dvObject.isInstanceofDataset()) {
+            metadataTemplate.setDescription(dataset.getLatestVersion().getDescriptionPlainText());
+        }
+        if (dvObject.isInstanceofDataFile()) {
+            DataFile df = (DataFile) dvObject;
+            String fileDescription = df.getDescription();
+            metadataTemplate.setDescription(fileDescription == null ? "" : fileDescription);
+            String datasetPid = df.getOwner().getGlobalId().asString();
+            metadataTemplate.setDatasetIdentifier(datasetPid);
+        } else {
+            metadataTemplate.setDatasetIdentifier("");
+        }
+
+        metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
+        metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
+        metadataTemplate.setTitle(dvObject.getDisplayName());
+        String producerString = dataverseService.findRootDataverse().getName();
+        if (producerString.isEmpty()) {
+            producerString = ":unav";
+        }
+        metadataTemplate.setPublisher(producerString);
+        metadataTemplate.setPublisherYear(metadata.get("datacite.publicationyear"));
+
+        String xmlMetadata = metadataTemplate.generateXML(dvObject);
+        logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata);
+        return xmlMetadata;
+    }
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
index 1b1eb6460f6..00c264afeb7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java
@@ -6,11 +6,15 @@
 
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Objects;
+import java.util.MissingResourceException;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -107,6 +111,16 @@ public void setControlledVocabAlternates(Collection co
         this.controlledVocabAlternates = controlledVocabAlternates;
     }
 
+    public String getLocaleStrValue()
+    {
+        String key = strValue.toLowerCase().replace(" " , "_");
+        key = StringUtils.stripAccents(key);
+        try {
+            return BundleUtil.getStringFromPropertyFile("controlledvocabulary." + this.datasetFieldType.getName() + "." + key, getDatasetFieldType().getMetadataBlock().getName());
+        } catch (MissingResourceException e) {
+            return strValue;
+        }
+    }
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
index 5df20b28241..50f92f81fb5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
@@ -5,6 +5,7 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.AbstractGlobalIdServiceBean.GlobalIdMetadataTemplate;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -18,6 +19,7 @@
 import java.util.logging.Logger;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
@@ -41,8 +43,18 @@ public class DOIDataCiteRegisterService {
     @EJB
     DataverseServiceBean dataverseService;
 
-    private DataCiteRESTfullClient openClient() throws IOException {
-        return new DataCiteRESTfullClient(System.getProperty("doi.baseurlstring"), System.getProperty("doi.username"), System.getProperty("doi.password"));
+    @EJB
+    DOIDataCiteServiceBean doiDataCiteServiceBean;
+    
+        
+    //A singleton since it, and the httpClient in it can be reused.
+    private DataCiteRESTfullClient client=null;
+    
+    private DataCiteRESTfullClient getClient() throws IOException {
+        if (client == null) {
+            client = new DataCiteRESTfullClient(System.getProperty("doi.baseurlstring"), System.getProperty("doi.username"), System.getProperty("doi.password"));
+        }
+        return client;
     }
 
     public String createIdentifierLocal(String identifier, Map metadata, DvObject dvObject) {
@@ -84,14 +96,16 @@ public String registerIdentifier(String identifier, Map metadata
             } else {
                 rc.setUrl(target);
             }
-            try (DataCiteRESTfullClient client = openClient()) {
+            try {
+                DataCiteRESTfullClient client = getClient();
                 retString = client.postMetadata(xmlMetadata);
                 client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
             } catch (UnsupportedEncodingException ex) {
                 Logger.getLogger(DOIDataCiteRegisterService.class.getName()).log(Level.SEVERE, null, ex);
             }
         } else {
-            try (DataCiteRESTfullClient client = openClient()) {
+            try {
+                DataCiteRESTfullClient client = getClient();
                 retString = client.postMetadata(xmlMetadata);
                 client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
             } catch (UnsupportedEncodingException ex) {
@@ -104,7 +118,8 @@ public String registerIdentifier(String identifier, Map metadata
     public String deactivateIdentifier(String identifier, HashMap metadata, DvObject dvObject) {
         String retString = "";
         DOIDataCiteRegisterCache rc = findByDOI(identifier);
-        try (DataCiteRESTfullClient client = openClient()) {
+        try {
+            DataCiteRESTfullClient client = getClient();
             if (rc != null) {
                 rc.setStatus("unavailable");
                 retString = client.inactiveDataset(identifier.substring(identifier.indexOf(":") + 1));
@@ -115,7 +130,7 @@ public String deactivateIdentifier(String identifier, HashMap me
         return retString;
     }
 
-    private String getMetadataFromDvObject(String identifier, Map metadata, DvObject dvObject) {
+    public static String getMetadataFromDvObject(String identifier, Map metadata, DvObject dvObject) {
 
         Dataset dataset = null;
 
@@ -145,7 +160,7 @@ private String getMetadataFromDvObject(String identifier, Map me
         metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
         metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
         metadataTemplate.setTitle(dvObject.getDisplayName());
-        String producerString = dataverseService.findRootDataverse().getName();
+        String producerString = dataset.getLatestVersion().getRootDataverseNameforCitation();
         if (producerString.isEmpty()) {
             producerString = ":unav";
         }
@@ -193,7 +208,8 @@ public String modifyIdentifier(String identifier, HashMap metada
                 } else {
                     rc.setUrl(target);
                 }
-                try (DataCiteRESTfullClient client = openClient()) {
+                try {
+                    DataCiteRESTfullClient client = getClient();
                     retString = client.postMetadata(xmlMetadata);
                     client.postUrl(identifier.substring(identifier.indexOf(":") + 1), target);
 
@@ -208,7 +224,8 @@ public String modifyIdentifier(String identifier, HashMap metada
             }
         } else if (status.equals("unavailable")) {
             DOIDataCiteRegisterCache rc = findByDOI(identifier);
-            try (DataCiteRESTfullClient client = openClient()) {
+            try {
+                DataCiteRESTfullClient client = getClient();
                 if (rc != null) {
                     rc.setStatus("unavailable");
                     retString = client.inactiveDataset(identifier.substring(identifier.indexOf(":") + 1));
@@ -222,7 +239,8 @@ public String modifyIdentifier(String identifier, HashMap metada
 
     public boolean testDOIExists(String identifier) {
         boolean doiExists;
-        try (DataCiteRESTfullClient client = openClient()) {
+        try {
+            DataCiteRESTfullClient client = getClient();
             doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1));
         } catch (Exception e) {
             logger.log(Level.INFO, identifier, e);
@@ -233,9 +251,10 @@ public boolean testDOIExists(String identifier) {
 
     public HashMap getMetadata(String identifier) throws IOException {
         HashMap metadata = new HashMap<>();
-        try (DataCiteRESTfullClient client = openClient()) {
+        try {
+            DataCiteRESTfullClient client = getClient();
             String xmlMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1));
-            DataCiteMetadataTemplate template = new DataCiteMetadataTemplate(xmlMetadata);
+            DOIDataCiteServiceBean.GlobalIdMetadataTemplate template = doiDataCiteServiceBean.new GlobalIdMetadataTemplate(xmlMetadata);
             metadata.put("datacite.creator", Util.getStrFromList(template.getCreators()));
             metadata.put("datacite.title", template.getTitle());
             metadata.put("datacite.publisher", template.getPublisher());
@@ -593,4 +612,5 @@ public static String getStrFromList(List authors) {
         }
         return str.toString();
     }
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java
index 83ac0a699b8..ab622fc5b43 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DOIEZIdServiceBean.java
@@ -213,17 +213,21 @@ public boolean publicizeIdentifier(DvObject dvObject) {
     }
 
     private boolean updateIdentifierStatus(DvObject dvObject, String statusIn) {
-        logger.log(Level.FINE,"updateIdentifierStatus");
+        logger.log(Level.FINE, "updateIdentifierStatus");
         String identifier = getIdentifier(dvObject);
         Map metadata = getUpdateMetadata(dvObject);
-        metadata.put("_status", statusIn);
-        metadata.put("_target", getTargetUrl(dvObject));
+        String objMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+        Map dcMetadata;
+        dcMetadata = new HashMap<>();
+        dcMetadata.put("datacite", objMetadata);
+        dcMetadata.put("_status", statusIn);
+        dcMetadata.put("_target", getTargetUrl(dvObject));
+
         try {
-            // ezID API requires HashMap, not just any map.
-            ezidService.setMetadata(identifier,
-                (metadata instanceof HashMap) ? (HashMap)metadata : new HashMap<>(metadata));
+            // ezID API requires HashMap, not just any map.            
+            ezidService.setMetadata(identifier, asHashMap(dcMetadata));
             return true;
-            
+
         } catch (EZIDException e) {
             logger.log(Level.WARNING, "modifyMetadata failed");
             logger.log(Level.WARNING, "String {0}", e.toString());
@@ -252,10 +256,15 @@ public String createIdentifier(DvObject dvObject) throws Throwable {
         }
         String identifier = getIdentifier(dvObject);
         Map metadata = getMetadataForCreateIndicator(dvObject);
-        metadata.put("datacite.resourcetype", "Dataset");
-        metadata.put("_status", "reserved");
+        String objMetadata = getMetadataFromDvObject(identifier, metadata, dvObject);
+        Map dcMetadata;
+        dcMetadata = new HashMap<>();
+        dcMetadata.put("datacite", objMetadata);
+        dcMetadata.put("datacite.resourcetype", "Dataset");
+        dcMetadata.put("_status", "reserved");
+
         try {
-            String retString = ezidService.createIdentifier(identifier, asHashMap(metadata));
+            String retString = ezidService.createIdentifier(identifier, asHashMap(dcMetadata));
             logger.log(Level.FINE, "create DOI identifier retString : {0}", retString);
             return retString;
         } catch (EZIDException e) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java b/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java
index e97f5a9ecda..5b6cdd23775 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java
@@ -11,6 +11,8 @@
 import edu.harvard.iq.dataverse.harvest.server.OAISet;
 import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
 import java.util.logging.Logger;
@@ -63,7 +65,7 @@ public String init() {
 
         /* 
             use this to add some kind of a tooltip/info message to the top of the page:
-            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, JH.localize("dashboard.title"), JH.localize("dashboard.toptip")));
+            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dashboard.title"), BundleUtil.getStringFromBundle("dashboard.toptip")));
             - the values for "dashboard.title" and "dashboard.toptip" would need to be added to the resource bundle.
          */
         return null;
@@ -129,7 +131,7 @@ public int getNumberOfOaiSets() {
     public String getHarvestClientsInfoLabel() {
         List configuredHarvestingClients = harvestingClientService.getAllHarvestingClients();
         if (configuredHarvestingClients == null || configuredHarvestingClients.isEmpty()) {
-            return JH.localize("harvestclients.noClients.label");
+            return BundleUtil.getStringFromBundle("harvestclients.noClients.label");
         }
         
         String infoLabel;
@@ -158,7 +160,7 @@ public String getHarvestServerInfoLabel() {
         
         List configuredHarvestingSets = oaiSetService.findAll();
         if (configuredHarvestingSets == null || configuredHarvestingSets.isEmpty()) {
-            infoLabel = infoLabel.concat(JH.localize("harvestserver.service.empty"));
+            infoLabel = infoLabel.concat(BundleUtil.getStringFromBundle("harvestserver.service.empty"));
             return infoLabel;
         }
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataCitation.java b/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
index 061b087908a..15f5fca8eb2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataCitation.java
@@ -17,7 +17,9 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -29,6 +31,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -139,7 +142,7 @@ private void getCommonValuesFrom(DatasetVersion dsv) {
     }
 
     public String getAuthorsString() {
-        return String.join(";", authors);
+        return String.join("; ", authors);
     }
 
     public String getTitle() {
@@ -201,7 +204,6 @@ public String toString(boolean html) {
         citationList.add(version);
 
         StringBuilder citation = new StringBuilder(citationList.stream().filter(value -> !StringUtils.isEmpty(value))
-                // QDRCustom: Use period to join values, not comma
                 .collect(Collectors.joining(separator)));
 
         if ((fileTitle != null) && !isDirect()) {
@@ -256,21 +258,28 @@ public void writeAsBibtexCitation(OutputStream os) throws IOException {
         out.write(publisher);
         out.write("},\r\n");
         if(getFileTitle() !=null && isDirect()) {
-        out.write("title = {");
-        out.write(fileTitle);
-        out.write("},\r\n");
-        out.write("booktitle = {");
-        out.write(title);
-        out.write("},\r\n");
+            out.write("title = {");
+            out.write(fileTitle);
+            out.write("},\r\n");
+            out.write("booktitle = {");
+            out.write(title);
+            out.write("},\r\n");
         } else {
             out.write("title = {");
             out.write(title);
             out.write("},\r\n");
-            
+        }
+        if(UNF != null){
+            out.write("UNF = {");
+            out.write(UNF);
+            out.write("},\r\n");
         }
         out.write("year = {");
         out.write(year);
         out.write("},\r\n");
+        out.write("version = {");
+        out.write(version);
+        out.write("},\r\n");
         out.write("doi = {");
         out.write(persistentId.getAuthority());
         out.write("/");
@@ -279,6 +288,7 @@ public void writeAsBibtexCitation(OutputStream os) throws IOException {
         out.write("url = {");
         out.write(persistentId.toURL().toString());
         out.write("}\r\n");
+        out.write("}\r\n");
         out.flush();
     }
 
@@ -311,9 +321,10 @@ public void writeAsRISCitation(OutputStream os) throws IOException {
         if (seriesTitle != null) {
             out.write("T3  - " + seriesTitle + "\r\n");
         }
+        /* Removing abstract/description per Request from G. King in #3759
         if(description!=null) {
             out.write("AB  - " + flattenHtml(description) + "\r\n");
-        }
+        } */
         for (String author : authors) {
             out.write("AU  - " + author + "\r\n");
         }
@@ -496,12 +507,13 @@ private void createEndNoteXML(XMLStreamWriter xmlw) throws XMLStreamException {
 
         xmlw.writeCharacters(sectionString);
         xmlw.writeEndElement(); // section
-
+/* Removing abstract/description per Request from G. King in #3759
         xmlw.writeStartElement("abstract");
         if(description!=null) {
             xmlw.writeCharacters(flattenHtml(description));
         }
         xmlw.writeEndElement(); // abstract
+         */
 
         xmlw.writeStartElement("dates");
         xmlw.writeStartElement("year");
@@ -592,9 +604,30 @@ private void createEndNoteXML(XMLStreamWriter xmlw) throws XMLStreamException {
 
         xmlw.writeEndElement(); // records
         xmlw.writeEndElement(); // xml
+
     }
 
+	public Map getDataCiteMetadata() {
+        Map metadata = new HashMap<>();
+        String authorString = getAuthorsString();
+
+        if (authorString.isEmpty()) {
+            authorString = ":unav";
+    }
+        String producerString = getPublisher();
+
+        if (producerString.isEmpty()) {
+            producerString = ":unav";
+        }
+
+        metadata.put("datacite.creator", authorString);
+        metadata.put("datacite.title", getTitle());
+        metadata.put("datacite.publisher", producerString);
+        metadata.put("datacite.publicationyear", getYear());
+        return metadata;
+	}
 
+	
     // helper methods   
     private String formatString(String value, boolean escapeHtml) {
         return formatString(value, escapeHtml, "");
@@ -720,11 +753,11 @@ private String getVersionFrom(DatasetVersion dsv) {
         String version = "";
         if (!dsv.getDataset().isHarvested()) {
             if (dsv.isDraft()) {
-                version = "DRAFT VERSION";
+                version = BundleUtil.getStringFromBundle("draftversion");
             } else if (dsv.getVersionNumber() != null) {
                 version = "V" + dsv.getVersionNumber();
                 if (dsv.isDeaccessioned()) {
-                    version += ", DEACCESSIONED VERSION";
+                    version += ", "+ BundleUtil.getStringFromBundle("deaccessionedversion");
                 }
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java
index a329f663fb5..a8ddc3b06e9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataCiteRESTfullClient.java
@@ -64,9 +64,13 @@ public DataCiteRESTfullClient(String url, String username, String password) thro
         }
     }
 
-    public void close() throws IOException {
+    public void close() {
         if (this.httpClient != null) {
+            try {
            httpClient.close();
+            } catch (IOException io) {
+               logger.warning("IOException closing hhtpClient: " + io.getMessage());
+           }
         }
     }
 
@@ -154,8 +158,10 @@ public boolean testDOIExists(String doi) {
         try {
             HttpResponse response = httpClient.execute(httpGet,context);
             if (response.getStatusLine().getStatusCode() != 200) {
+                EntityUtils.consumeQuietly(response.getEntity());
                 return false;
             }
+            EntityUtils.consumeQuietly(response.getEntity());
             return true;
         } catch (IOException ioe) {
             logger.log(Level.SEVERE, "IOException when get metadata");
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
index 02061e4ecfe..c85d6efffaa 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
@@ -369,6 +369,16 @@ public String getOriginalFileFormat() {
         }
         return null;
     }
+    
+    public Long getOriginalFileSize() {
+        if (isTabularData()) {
+            DataTable dataTable = getDataTable();
+            if (dataTable != null) {
+                return dataTable.getOriginalFileSize();
+            }
+        }
+        return null;
+    }
 
     @Override
     public boolean isAncestorOf( DvObject other ) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
index 08846ffc1e4..71d25a146c1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
@@ -491,7 +491,7 @@ public DataFile findCheapAndEasy(Long id) {
         if (MIME_TYPE_TSV.equalsIgnoreCase(contentType)) {
             Object[] dtResult;
             try {
-                dtResult = (Object[]) em.createNativeQuery("SELECT ID, UNF, CASEQUANTITY, VARQUANTITY, ORIGINALFILEFORMAT FROM dataTable WHERE DATAFILE_ID = " + id).getSingleResult();
+                dtResult = (Object[]) em.createNativeQuery("SELECT ID, UNF, CASEQUANTITY, VARQUANTITY, ORIGINALFILEFORMAT, ORIGINALFILESIZE FROM dataTable WHERE DATAFILE_ID = " + id).getSingleResult();
             } catch (Exception ex) {
                 dtResult = null;
             }
@@ -509,6 +509,8 @@ public DataFile findCheapAndEasy(Long id) {
             
                 dataTable.setOriginalFileFormat((String)dtResult[4]);
                 
+                dataTable.setOriginalFileSize((Long)dtResult[5]);
+                
                 dataTable.setDataFile(dataFile);
                 dataFile.setDataTable(dataTable);
                 
@@ -567,7 +569,7 @@ public void findFileMetadataOptimizedExperimental(Dataset owner, DatasetVersion
         
         int i = 0; 
         
-        List dataTableResults = em.createNativeQuery("SELECT t0.ID, t0.DATAFILE_ID, t0.UNF, t0.CASEQUANTITY, t0.VARQUANTITY, t0.ORIGINALFILEFORMAT FROM dataTable t0, dataFile t1, dvObject t2 WHERE ((t0.DATAFILE_ID = t1.ID) AND (t1.ID = t2.ID) AND (t2.OWNER_ID = " + owner.getId() + ")) ORDER BY t0.ID").getResultList();
+        List dataTableResults = em.createNativeQuery("SELECT t0.ID, t0.DATAFILE_ID, t0.UNF, t0.CASEQUANTITY, t0.VARQUANTITY, t0.ORIGINALFILEFORMAT, t0.ORIGINALFILESIZE FROM dataTable t0, dataFile t1, dvObject t2 WHERE ((t0.DATAFILE_ID = t1.ID) AND (t1.ID = t2.ID) AND (t2.OWNER_ID = " + owner.getId() + ")) ORDER BY t0.ID").getResultList();
         
         for (Object[] result : dataTableResults) {
             DataTable dataTable = new DataTable(); 
@@ -583,6 +585,8 @@ public void findFileMetadataOptimizedExperimental(Dataset owner, DatasetVersion
             
             dataTable.setOriginalFileFormat((String)result[5]);
             
+            dataTable.setOriginalFileSize((Long)result[6]);
+            
             dataTables.add(dataTable);
             datatableMap.put(fileId, i++);
             
@@ -1444,7 +1448,7 @@ public boolean isReplacementFile(DataFile df) {
     }  // end: isReplacementFile
     
     public List selectFilesWithMissingOriginalTypes() {
-        Query query = em.createNativeQuery("SELECT f.id FROM datafile f, datatable t where t.datafile_id = f.id AND t.originalfileformat='" + MIME_TYPE_TSV + "' ORDER BY f.id");
+        Query query = em.createNativeQuery("SELECT f.id FROM datafile f, datatable t where t.datafile_id = f.id AND (t.originalfileformat='" + MIME_TYPE_TSV + "' OR t.originalfileformat IS NULL) ORDER BY f.id");
         
         try {
             return query.getResultList();
@@ -1453,7 +1457,15 @@ public List selectFilesWithMissingOriginalTypes() {
         }
     }
     
-    
+    public List selectFilesWithMissingOriginalSizes() {
+        Query query = em.createNativeQuery("SELECT f.id FROM datafile f, datatable t where t.datafile_id = f.id AND (t.originalfilesize IS NULL ) AND (t.originalfileformat IS NOT NULL) ORDER BY f.id");
+        
+        try {
+            return query.getResultList();
+        } catch (Exception ex) {
+            return new ArrayList<>();
+        }
+    }
     
     public String generateDataFileIdentifier(DataFile datafile, GlobalIdServiceBean idServiceBean) {
         String doiIdentifierType = settingsService.getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "randomString");
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataTable.java b/src/main/java/edu/harvard/iq/dataverse/DataTable.java
index 501624efab7..60562caa6df 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataTable.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataTable.java
@@ -103,6 +103,12 @@ public DataTable() {
      */
     private String originalFormatVersion;
     
+    /* 
+     * Size of the original file:
+    */
+    
+    private Long originalFileSize; 
+    
     /*
      * Getter and Setter methods:
      */
@@ -172,6 +178,14 @@ public void setOriginalFileFormat(String originalFileType) {
         this.originalFileFormat = originalFileType;
     }
 
+    public Long getOriginalFileSize() {
+        return originalFileSize; 
+    }
+    
+    public void setOriginalFileSize(Long originalFileSize) {
+        this.originalFileSize = originalFileSize;
+    }
+    
     
     public String getOriginalFormatVersion() {
         return originalFormatVersion;
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataset.java b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
index eabe1b9747c..ca410bc0f2a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataset.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
@@ -40,8 +40,10 @@
                query = "SELECT d FROM Dataset d WHERE d.identifier=:identifier"),
     @NamedQuery(name = "Dataset.findByIdentifierAuthorityProtocol",
                query = "SELECT d FROM Dataset d WHERE d.identifier=:identifier AND d.protocol=:protocol AND d.authority=:authority"),
-    @NamedQuery(name = "Dataset.findByOwnerIdentifier", 
-                query = "SELECT o.identifier FROM DvObject o WHERE o.owner.id=:owner_id")
+    @NamedQuery(name = "Dataset.findIdByOwnerId", 
+                query = "SELECT o.identifier FROM Dataset o WHERE o.owner.id=:ownerId"),
+    @NamedQuery(name = "Dataset.findByOwnerId", 
+                query = "SELECT o FROM Dataset o WHERE o.owner.id=:ownerId"),
 })
 
 /*
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java b/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java
index b1f1e4b459c..ce8405a0164 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetAuthor.java
@@ -7,6 +7,7 @@
 package edu.harvard.iq.dataverse;
 
 import java.util.Comparator;
+import java.util.regex.Pattern;
 
 
 /**
@@ -87,5 +88,60 @@ public boolean isEmpty() {
             && (name==null || name.getValue().trim().equals(""))
            );
     }
-    
+
+    /**
+     * https://support.orcid.org/hc/en-us/articles/360006897674-Structure-of-the-ORCID-Identifier
+     */
+    final public static String REGEX_ORCID = "^\\d{4}-\\d{4}-\\d{4}-(\\d{4}|\\d{3}X)$";
+    final public static String REGEX_ISNI = "^\\d*$";
+    final public static String REGEX_LCNA = "^[a-z]+\\d+$";
+    final public static String REGEX_VIAF = "^\\d*$";
+    /**
+     * GND regex from https://www.wikidata.org/wiki/Property:P227
+     */
+    final public static String REGEX_GND = "^1[01]?\\d{7}[0-9X]|[47]\\d{6}-\\d|[1-9]\\d{0,7}-[0-9X]|3\\d{7}[0-9X]$";
+
+    /**
+     * Each author identification type has its own valid pattern/syntax.
+     */
+    public static Pattern getValidPattern(String regex) {
+        return Pattern.compile(regex);
+    }
+
+    public String getIdentifierAsUrl() {
+        if (idType != null && !idType.isEmpty() && idValue != null && !idValue.isEmpty()) {
+            DatasetFieldValueValidator datasetFieldValueValidator = new DatasetFieldValueValidator();
+            switch (idType) {
+                case "ORCID":
+                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_ORCID))) {
+                        return "https://orcid.org/" + idValue;
+                    }
+                    break;
+                case "ISNI":
+                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_ISNI))) {
+                        return "http://www.isni.org/isni/" + idValue;
+                    }
+                    break;
+                case "LCNA":
+                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_LCNA))) {
+                        return "http://id.loc.gov/authorities/names/" + idValue;
+                    }
+                    break;
+                case "VIAF":
+                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_VIAF))) {
+                        return "https://viaf.org/viaf/" + idValue;
+                    }
+                    break;
+                case "GND":
+                    if (datasetFieldValueValidator.isValidAuthorIdentifier(idValue, getValidPattern(REGEX_GND))) {
+                        return "https://d-nb.info/gnd/" + idValue;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
index 7bea9250279..d9250c4093f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java
@@ -335,7 +335,8 @@ public boolean isEmptyForDisplay() {
 
     private boolean isEmpty(boolean forDisplay) {
         if (datasetFieldType.isPrimitive()) { // primitive
-            for (String value : getValues()) {
+        	List values = forDisplay ? getValues() : getValues_nondisplay();
+            for (String value : values) {
                 if (!StringUtils.isBlank(value) && !(forDisplay && DatasetField.NA_VALUE.equals(value))) {
                     return false;
                 }
@@ -549,6 +550,22 @@ public void setValueDisplayOrder() {
             }
         }
     }
+    
+    public void trimTrailingSpaces() {
+        if (this.getDatasetFieldType().isPrimitive() && !this.getDatasetFieldType().isControlledVocabulary()) {
+            for (int i = 0; i < datasetFieldValues.size(); i++) {
+                datasetFieldValues.get(i).setValue(datasetFieldValues.get(i).getValue().trim());
+            }
+        } else if (this.getDatasetFieldType().isCompound()) {
+            for (int i = 0; i < datasetFieldCompoundValues.size(); i++) {
+                DatasetFieldCompoundValue compoundValue = datasetFieldCompoundValues.get(i);
+                for (DatasetField dsf : compoundValue.getChildDatasetFields()) {
+                    dsf.trimTrailingSpaces();
+                }
+            }
+        }
+    }
+     
 
     public void addDatasetFieldValue(int index) {
         datasetFieldValues.add(index, new DatasetFieldValue(this));
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java
index 98d8079146e..86bb270bcae 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldCompoundValue.java
@@ -5,6 +5,7 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.MarkupChecker;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -153,7 +154,7 @@ public Map getDisplayValueMap() {
                         .replace("#NAME", childDatasetField.getDatasetFieldType().getTitle())
                         //todo: this should be handled in more generic way for any other text that can then be internationalized
                         // if we need to use replaceAll for regexp, then make sure to use: java.util.regex.Matcher.quoteReplacement()
-                        .replace("#EMAIL", ResourceBundle.getBundle("Bundle").getString("dataset.email.hiddenMessage"))
+                        .replace("#EMAIL", BundleUtil.getStringFromBundle("dataset.email.hiddenMessage"))
                         .replace("#VALUE",  sanitizedValue );
 
                 fieldMap.put(childDatasetField,displayValue);
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index c3546ef44b2..04901264455 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -1,6 +1,8 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.search.SolrField;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.util.Collection;
 
 import java.io.Serializable;
@@ -9,6 +11,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.MissingResourceException;
 import javax.faces.model.SelectItem;
 import javax.persistence.*;
 
@@ -294,6 +297,20 @@ public void setMetadataBlock(MetadataBlock metadataBlock) {
         this.metadataBlock = metadataBlock;
     }
 
+    /**
+     * A formal URI for the field used in json-ld exports
+     */
+    @Column(name = "uri", columnDefinition = "TEXT")
+    private String uri;
+
+    public String getUri() {
+    	return uri;
+    }
+
+    public void setUri(String uri) {
+    	this.uri=uri;
+    }
+    
     /**
      * The list of controlled vocabulary terms that may be used as values for
      * fields of this field type.
@@ -493,9 +510,9 @@ public int compareTo(DatasetFieldType o) {
     
     public String getDisplayName() {
         if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) {
-        return parentDatasetFieldType.getTitle() + " " + title;
+        return parentDatasetFieldType.getLocaleTitle()  + " " + getLocaleTitle();
         } else {
-            return title;
+            return getLocaleTitle();
         }
     }
 
@@ -542,6 +559,43 @@ public SolrField getSolrField() {
         }
     }
 
+    public String getLocaleTitle() {
+        if(getMetadataBlock()  == null) {
+            return title;
+        }
+        else {
+            try {
+                return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName());
+            } catch (MissingResourceException e) {
+                return title;
+            }
+        }
+    }
+
+    public String getLocaleDescription() {
+        if(getMetadataBlock()  == null) {
+            return description;
+        } else {
+            try {
+                return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".description", getMetadataBlock().getName());
+            } catch (MissingResourceException e) {
+                return description;
+            }
+        }
+    }
+
+    public String getLocaleWatermark()    {
+        if(getMetadataBlock()  == null) {
+            return watermark;
+        } else {
+            try {
+                return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".watermark", getMetadataBlock().getName());
+            } catch (MissingResourceException e) {
+                return watermark;
+            }
+        }
+    }
+
     // help us identify fields that have null fieldType values
     public String getTmpNullFieldTypeIdentifier() {
         return "NullFieldType_s";
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
index 0005e52daf6..425ed0b22ef 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValidator.java
@@ -7,6 +7,8 @@
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.apache.commons.lang.StringUtils;
 
 
@@ -32,7 +34,7 @@ public boolean isValid(DatasetField value, ConstraintValidatorContext context) {
         if (((dsfType.isPrimitive() && dsfType.isRequired())  || (dsfType.isPrimitive() && value.isRequired())) 
                 && StringUtils.isBlank(value.getValue())) {
             try{
-                context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is required.").addConstraintViolation();
+                context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " " + BundleUtil.getStringFromBundle("isrequired")).addConstraintViolation();
             } catch (NullPointerException npe){
                 //if there's no context for the error we can't put it anywhere....
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java
index c10be2e9163..cf6c762f3ed 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValue.java
@@ -6,6 +6,7 @@
 
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.MarkupChecker;
 import java.io.Serializable;
 import java.util.Comparator;
@@ -106,7 +107,7 @@ public String getDisplayValue() {
             // want any issues if the value itself has #NAME in it)
             String displayValue = format
                     .replace("#NAME",  this.datasetField.getDatasetFieldType().getTitle() == null ? "" : this.datasetField.getDatasetFieldType().getTitle())
-                    .replace("#EMAIL", ResourceBundle.getBundle("Bundle").getString("dataset.email.hiddenMessage"))
+                    .replace("#EMAIL", BundleUtil.getStringFromBundle("dataset.email.hiddenMessage"))
                     .replace("#VALUE", sanitizedValue);
             retVal = displayValue;
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
index ac79058fd98..e571fd89627 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java
@@ -14,6 +14,8 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 import org.apache.commons.lang.StringUtils;
@@ -216,4 +218,8 @@ private boolean isValidDate(String dateString, String pattern) {
         return valid;
     }
 
+    public boolean isValidAuthorIdentifier(String userInput, Pattern pattern) {
+        return pattern.matcher(userInput).matches();
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index ad23b569fb9..2b73ad9a92a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.provenance.ProvPopupFragmentBean;
+import edu.harvard.iq.dataverse.PackagePopupFragmentBean;
 import edu.harvard.iq.dataverse.api.AbstractApiBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -197,7 +198,6 @@ public enum DisplayMode {
     @Inject 
     ProvPopupFragmentBean provPopupFragmentBean;
 
-
     private Dataset dataset = new Dataset();
     private EditMode editMode;
     private boolean bulkFileDeleteInProgress = false;
@@ -457,6 +457,8 @@ public String getFileLabelSearchTerm() {
     public void setFileLabelSearchTerm(String fileLabelSearchTerm) {
         if (fileLabelSearchTerm != null) {
             this.fileLabelSearchTerm = fileLabelSearchTerm.trim();
+        } else {
+            this.fileLabelSearchTerm="";
         }
     }
     
@@ -1431,7 +1433,7 @@ private String init(boolean initFull) {
 
             if (!retrieveDatasetVersionResponse.wasRequestedVersionRetrieved()) {
                 //msg("checkit " + retrieveDatasetVersionResponse.getDifferentVersionMessage());
-                JsfHelper.addWarningMessage(retrieveDatasetVersionResponse.getDifferentVersionMessage());//JH.localize("dataset.message.metadataSuccess"));
+                JsfHelper.addWarningMessage(retrieveDatasetVersionResponse.getDifferentVersionMessage());//BundleUtil.getStringFromBundle("dataset.message.metadataSuccess"));
             }
             
             // init the citation
@@ -1466,7 +1468,8 @@ private String init(boolean initFull) {
                 this.guestbookResponse = guestbookResponseService.initGuestbookResponseForFragment(workingVersion, null, session);
                 this.getFileDownloadHelper().setGuestbookResponse(guestbookResponse);
                 logger.fine("Checking if rsync support is enabled.");
-                if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsWrapper.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
+                if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsWrapper.getValueForKey(SettingsServiceBean.Key.UploadMethods))
+                        && dataset.getFiles().isEmpty()) { //only check for rsync if no files exist
                     try {
                         ScriptRequestResponse scriptRequestResponse = commandEngine.submit(new RequestRsyncScriptCommand(dvRequestService.getDataverseRequest(), dataset));
                         logger.fine("script: " + scriptRequestResponse.getScript());
@@ -1549,10 +1552,10 @@ private String init(boolean initFull) {
         }
                 
         // Various info messages, when the dataset is locked (for various reasons):
-        if (dataset.isLocked()) {
+        if (dataset.isLocked() && canUpdateDataset()) {
             if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
                 JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"),
-                        BundleUtil.getStringFromBundle("dataset.publish.workflow.inprogress"));
+                        BundleUtil.getStringFromBundle("dataset.locked.message.details"));
             }
             if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
                 JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.inReview.message"),
@@ -1561,6 +1564,7 @@ private String init(boolean initFull) {
             if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
                 JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.summary"),
                         BundleUtil.getStringFromBundle("file.rsyncUpload.inProgressMessage.details"));
+                lockedDueToDcmUpload = true;
             }
             //This is a hack to remove dataset locks for File PID registration if 
                 //the dataset is released
@@ -1569,8 +1573,8 @@ private String init(boolean initFull) {
                     datasetService.removeDatasetLocks(dataset.getId(), DatasetLock.Reason.pidRegister);
                 }*/
             if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
-                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.pidRegister.workflow.inprogress"),
-                        BundleUtil.getStringFromBundle("dataset.publish.workflow.inprogress"));
+                JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.publish.workflow.message"),
+                        BundleUtil.getStringFromBundle("dataset.pidRegister.workflow.inprogress"));
             }
         }
         
@@ -1751,15 +1755,15 @@ public void edit(EditMode editMode) {
         if (editMode == EditMode.INFO) {
             // ?
         } else if (editMode == EditMode.FILE) {
-            // JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.message.editFiles"));
+            // JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editFiles"));
             // FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Upload + Edit Dataset Files", " - You can drag and drop your files from your desktop, directly into the upload widget."));
         } else if (editMode.equals(EditMode.METADATA)) {
             datasetVersionUI = datasetVersionUI.initDatasetVersionUI(workingVersion, true);
             updateDatasetFieldInputLevels();
-            JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.message.editMetadata"));
+            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editMetadata"));
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset Metadata", " - Add more metadata about your dataset to help others easily find it."));
         } else if (editMode.equals(EditMode.LICENSE)){
-            JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.message.editTerms"));
+            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms"));
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset License and Terms", " - Update your dataset's license and terms of use."));
         }
         this.readOnly = false;
@@ -1835,11 +1839,11 @@ private void releaseParentDV(){
             PublishDataverseCommand cmd = new PublishDataverseCommand(dvRequestService.getDataverseRequest(), dataset.getOwner());
             try {
                 commandEngine.submit(cmd);
-                JsfHelper.addSuccessMessage(JH.localize("dataverse.publish.success"));
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.publish.success"));
 
             } catch (CommandException ex) {
                 logger.log(Level.SEVERE, "Unexpected Exception calling  publish dataverse command", ex);
-                JsfHelper.addErrorMessage(JH.localize("dataverse.publish.failure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataverse.publish.failure"));
 
             }
         } else {
@@ -1869,9 +1873,9 @@ public String deaccessionVersions() {
             }
         } catch (CommandException ex) {
             logger.severe(ex.getMessage());
-            JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.message.deaccessionFailure"));
+            JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deaccessionFailure"));
         }
-        JsfHelper.addSuccessMessage(JH.localize("datasetVersion.message.deaccessionSuccess"));
+        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetVersion.message.deaccessionSuccess"));
         return returnToDatasetOnly();
     }
 
@@ -1880,22 +1884,22 @@ private DatasetVersion setDatasetVersionDeaccessionReasonAndURL(DatasetVersion d
         String deacessionReasonDetail = getDeaccessionReasonText() != null ? ( getDeaccessionReasonText()).trim() : "";
         switch (deaccessionReasonCode) {
             case 1:
-                dvIn.setVersionNote("There is identifiable data in one or more files.");
+                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.identifiable") );
                 break;
             case 2:
-                dvIn.setVersionNote("The research article has been retracted.");
+                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.beRetracted") );
                 break;
             case 3:
-                dvIn.setVersionNote("The dataset has been transferred to another repository.");
+                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.beTransferred") );
                 break;
             case 4:
-                dvIn.setVersionNote("IRB request.");
+                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.IRB"));
                 break;
             case 5:
-                dvIn.setVersionNote("Legal issue or Data Usage Agreement.");
+                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.legalIssue"));
                 break;
             case 6:
-                dvIn.setVersionNote("Not a valid dataset.");
+                dvIn.setVersionNote(BundleUtil.getStringFromBundle("file.deaccessionDialog.reason.selectItem.notValid"));
                 break;
             case 7:
                 break;
@@ -1939,7 +1943,7 @@ private String releaseDataset(boolean minor) {
                 if ( result.isCompleted() ) {
                     JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.publishSuccess"));
                 } else {
-                    JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"), BundleUtil.getStringFromBundle("dataset.publish.workflow.inprogress"));
+                    JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"), BundleUtil.getStringFromBundle("dataset.locked.message.details"));
                 }
                 
             } catch (CommandException ex) {
@@ -2039,10 +2043,10 @@ public String deleteDataset() {
              userNotificationService.delete(und);
              } */
         } catch (CommandException ex) {
-            JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.message.deleteFailure"));
+            JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deleteFailure"));
             logger.severe(ex.getMessage());
         }
-            JsfHelper.addSuccessMessage(JH.localize("dataset.message.deleteSuccess"));
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.deleteSuccess"));
         return "/dataverse.xhtml?alias=" + dataset.getOwner().getAlias() + "&faces-redirect=true";
     }
     
@@ -2064,9 +2068,9 @@ public String deleteDatasetVersion() {
         try {
             cmd = new DeleteDatasetVersionCommand(dvRequestService.getDataverseRequest(), dataset);
             commandEngine.submit(cmd);
-            JsfHelper.addSuccessMessage(JH.localize("datasetVersion.message.deleteSuccess"));
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetVersion.message.deleteSuccess"));
         } catch (CommandException ex) {
-            JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.message.deleteFailure"));
+            JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deleteFailure"));
             logger.severe(ex.getMessage());
         }
 
@@ -2375,10 +2379,11 @@ public String testSelectedFilesForRestrict(){
                 requestContext.execute("PF('selectFilesForRestrict').show()");           
             return "";
         } else {           
-            boolean validSelection = false;
+            boolean validSelection = true;
             for (FileMetadata fmd : selectedFiles) {
-                if (!fmd.isRestricted() ){
-                    validSelection = true;
+                if (fmd.isRestricted() == true) {
+                    validSelection = false;
+                    break;
                 }
             }
             if (!validSelection) {
@@ -2405,8 +2410,9 @@ public String restrictSelectedFiles(boolean restricted) throws CommandException{
         } else {
             boolean validSelection = true;
             for (FileMetadata fmd : selectedFiles) {
-                if ((fmd.isRestricted() && restricted) || (!fmd.isRestricted() && !restricted)) {
+                if (fmd.isRestricted() == restricted) {
                     validSelection = false;
+                    break;
                 }
             }
             if (!validSelection) {
@@ -2432,61 +2438,16 @@ public String restrictSelectedFiles(boolean restricted) throws CommandException{
         return  returnToDraftVersion();
     }
 
-    public void restrictFiles(boolean restricted) throws CommandException {
-   
-        //if (previouslyRestrictedFiles == null) {
-        // we don't need to buther with this "previously restricted" business 
-        // when in Create mode... because all the files are new, so none could 
-        // have been restricted previously;
-        // (well, it looks like the code below should never be called in the 
-        // CREATE mode in the first place... the edit files fragment uses
-        // its own restrictFiles() method there; also, the fmd.getDataFile().equals(fmw.getDataFile()))
-        // line is not going to work on a new file... so be mindful of all this
-        // when the code between the 2 beans is merged in 4.3.
-        if (editMode != EditMode.CREATE) {
-            previouslyRestrictedFiles = new ArrayList<>();
-            for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
-                if (fmd.isRestricted()) {
-                    previouslyRestrictedFiles.add(fmd);
-                }
+    private void restrictFiles(boolean restricted) throws CommandException {
+        Command cmd;
+        previouslyRestrictedFiles = new ArrayList<>();
+        for (FileMetadata fmd : this.getSelectedFiles()) {
+            if(fmd.isRestricted()) {
+                previouslyRestrictedFiles.add(fmd);
             }
-            
-            Command cmd;
-            String fileNames = null;
-            for (FileMetadata fmw : workingVersion.getFileMetadatas()) {
-                for (FileMetadata fmd : this.getSelectedFiles()) {
-                    if (restricted && !fmw.isRestricted()) {
-                    // collect the names of the newly-restrticted files, 
-                        // to show in the success message:
-                        // I don't think this does the right thing: 
-                        // (adds too many files to the message; good thing this 
-                        // message isn't used, normally)
-                        if (fileNames == null) {
-                            fileNames = fmd.getLabel();
-                        } else {
-                            fileNames = fileNames.concat(fmd.getLabel());
-                        }
-                    }
-                    if (fmd.getDataFile().equals(fmw.getDataFile())) {
-                        cmd = new RestrictFileCommand(fmw.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
-                        commandEngine.submit(cmd);
-                        
-                        
-//                        fmw.setRestricted(restricted);
-//                        if (workingVersion.isDraft() && !fmw.getDataFile().isReleased()) {
-//                            // We do not really need to check that the working version is 
-//                            // a draft here - it must be a draft, if we've gotten this
-//                            // far. But just in case. -- L.A. 4.2.1
-//                            fmw.getDataFile().setRestricted(restricted);
-//                        }
-                    }
-                }
-            }
-            if (fileNames != null) {
-                String successMessage = JH.localize("file.restricted.success");
-                logger.fine(successMessage);
-                successMessage = successMessage.replace("{0}", fileNames);
-                JsfHelper.addFlashMessage(successMessage);
+            if (restricted  != fmd.isRestricted()) {
+                cmd = new RestrictFileCommand(fmd.getDataFile(), dvRequestService.getDataverseRequest(), restricted);
+                commandEngine.submit(cmd);
             }
         }
     }
@@ -2568,6 +2529,33 @@ Do note that if we are deleting any files that have UNFs (i.e.,
            - but we will do this inside the UpdateDatasetCommand.
         */
     }
+    
+    private String enteredTermsOfAccess;
+
+    public String getEnteredTermsOfAccess() {
+        return enteredTermsOfAccess;
+    }
+
+    public void setEnteredTermsOfAccess(String enteredTermsOfAccess) {
+        this.enteredTermsOfAccess = enteredTermsOfAccess;
+    }
+    
+    private Boolean enteredFileAccessRequest;
+
+    public Boolean getEnteredFileAccessRequest() {
+        return enteredFileAccessRequest;
+    }
+
+    public void setEnteredFileAccessRequest(Boolean fileAccessRequest) {
+        this.enteredFileAccessRequest = fileAccessRequest;
+    }
+    
+    
+     public String saveWithTermsOfUse() {
+        workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(enteredTermsOfAccess);
+        workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(enteredFileAccessRequest);
+        return save();
+    }
 
     public String save() {
          //Before dataset saved, write cached prov freeform to version
@@ -2578,12 +2566,12 @@ public String save() {
         // Validate
         Set constraintViolations = workingVersion.validate();
         if (!constraintViolations.isEmpty()) {
-             //JsfHelper.addFlashMessage(JH.localize("dataset.message.validationError"));
-             JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("dataset.message.validationError"));
+             //JsfHelper.addFlashMessage(BundleUtil.getStringFromBundle("dataset.message.validationError"));
+             JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details."));
             return "";
         }
-
+        
         // Use the Create or Update command to save the dataset: 
         Command cmd;
         try {
@@ -2592,7 +2580,7 @@ public String save() {
                     if ( isSessionUserAuthenticated() ) {
                         cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest(), false, selectedTemplate); 
                     } else {
-                        JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.create.authenticatedUsersOnly"));
+                        JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.create.authenticatedUsersOnly"));
                         return null;
                     }
                 } else {
@@ -2661,36 +2649,36 @@ public String save() {
                     }
                     if (addFilesSuccess && dataset.getFiles().size() > 0) {
                         if (nNewFiles == dataset.getFiles().size()) {
-                            JsfHelper.addSuccessMessage(JH.localize("dataset.message.createSuccess"));
+                            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
                         } else {
-                            String partialSuccessMessage = JH.localize("dataset.message.createSuccess.partialSuccessSavingFiles");
+                            String partialSuccessMessage = BundleUtil.getStringFromBundle("dataset.message.createSuccess.partialSuccessSavingFiles");
                             partialSuccessMessage = partialSuccessMessage.replace("{0}", "" + dataset.getFiles().size() + "");
                             partialSuccessMessage = partialSuccessMessage.replace("{1}", "" + nNewFiles + "");
                             JsfHelper.addWarningMessage(partialSuccessMessage);
                         }
                     } else {
-                        JsfHelper.addWarningMessage(JH.localize("dataset.message.createSuccess.failedToSaveFiles"));
+                        JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess.failedToSaveFiles"));
                     }
                 } else {
-                    JsfHelper.addSuccessMessage(JH.localize("dataset.message.createSuccess"));
+                    JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
                 }
             }
             if (editMode.equals(EditMode.METADATA)) {
-                JsfHelper.addSuccessMessage(JH.localize("dataset.message.metadataSuccess"));
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.metadataSuccess"));
             }
             if (editMode.equals(EditMode.LICENSE)) {
-                JsfHelper.addSuccessMessage(JH.localize("dataset.message.termsSuccess"));
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.termsSuccess"));
             }
             if (editMode.equals(EditMode.FILE)) {
-                JsfHelper.addSuccessMessage(JH.localize("dataset.message.filesSuccess"));
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess"));
             }
 
         } else {
             // must have been a bulk file update or delete:
             if (bulkFileDeleteInProgress) {
-                JsfHelper.addSuccessMessage(JH.localize("dataset.message.bulkFileDeleteSuccess"));
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteSuccess"));
             } else {
-                JsfHelper.addSuccessMessage(JH.localize("dataset.message.bulkFileUpdateSuccess"));
+                JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileUpdateSuccess"));
             }
         }
 
@@ -2722,24 +2710,24 @@ private void populateDatasetUpdateFailureMessage(){
         if (editMode == null) {
             // that must have been a bulk file update or delete:
             if (bulkFileDeleteInProgress) {
-                JsfHelper.addErrorMessage(JH.localize("dataset.message.bulkFileDeleteFailure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteFailure"));
 
             } else {
-                JsfHelper.addErrorMessage(JH.localize("dataset.message.filesFailure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure"));
             }
         } else {
 
             if (editMode.equals(EditMode.CREATE)) {
-                JsfHelper.addErrorMessage(JH.localize("dataset.message.createFailure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.createFailure"));
             }
             if (editMode.equals(EditMode.METADATA)) {
-                JsfHelper.addErrorMessage(JH.localize("dataset.message.metadataFailure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.metadataFailure"));
             }
             if (editMode.equals(EditMode.LICENSE)) {
-                JsfHelper.addErrorMessage(JH.localize("dataset.message.termsFailure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.termsFailure"));
             }
             if (editMode.equals(EditMode.FILE)) {
-                JsfHelper.addErrorMessage(JH.localize("dataset.message.filesFailure"));
+                JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure"));
             }
         }
         
@@ -2934,6 +2922,7 @@ public boolean isLockedForAnyReason() {
 
     private Boolean lockedFromEditsVar;
     private Boolean lockedFromDownloadVar;    
+    private boolean lockedDueToDcmUpload;
     /**
      * Authors are not allowed to edit but curators are allowed - when Dataset is inReview
      * For all other locks edit should be locked for all editors.
@@ -2976,6 +2965,10 @@ public boolean isLockedFromDownload(){
         return lockedFromDownloadVar;
     }
 
+    public boolean isLockedDueToDcmUpload() {
+        return lockedDueToDcmUpload;
+    }
+
     public void setLocked(boolean locked) {
         // empty method, so that we can use DatasetPage.locked in a hidden 
         // input on the page. 
@@ -3394,7 +3387,7 @@ public void saveAsDesignatedThumbnail() {
         // However, once the "save" button is pressed, we want to show a success message, if this is 
         // a new image has been designated as such:
         if (getUseAsDatasetThumbnail() && !alreadyDesignatedAsDatasetThumbnail) {
-            String successMessage = JH.localize("file.assignedDataverseImage.success");
+            String successMessage = BundleUtil.getStringFromBundle("file.assignedDataverseImage.success");
             logger.fine(successMessage);
             successMessage = successMessage.replace("{0}", fileMetadataSelectedForThumbnailPopup.getLabel());
             JsfHelper.addFlashMessage(successMessage);
@@ -3657,7 +3650,7 @@ public String saveFileTagsAndCategories() {
             }
         }
                // success message: 
-                String successMessage = JH.localize("file.assignedTabFileTags.success");
+                String successMessage = BundleUtil.getStringFromBundle("file.assignedTabFileTags.success");
                 logger.fine(successMessage);
                 successMessage = successMessage.replace("{0}", "Selected Files");
                 JsfHelper.addFlashMessage(successMessage);
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java b/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java
index 6bf55445d57..7680ebc16db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java
@@ -14,7 +14,9 @@
 
 public class DatasetRelPublication {
 
-
+    /**
+     * The "text" is the citation of the related publication.
+     */
     private String text;
     private String idType;
     private String idNumber;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
index 714fb54313e..55f8d1e1a92 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
@@ -113,7 +113,7 @@ public List findPublishedByOwnerId(Long ownerId) {
 
     private List findByOwnerId(Long ownerId, boolean onlyPublished) {
         List retList = new ArrayList<>();
-        TypedQuery  query = em.createQuery("select object(o) from Dataset as o where o.owner.id =:ownerId order by o.id", Dataset.class);
+        TypedQuery  query = em.createNamedQuery("Dataset.findByOwnerId", Dataset.class);
         query.setParameter("ownerId", ownerId);
         if (!onlyPublished) {
             return query.getResultList();
@@ -134,13 +134,13 @@ public List findIdsByOwnerId(Long ownerId) {
     private List findIdsByOwnerId(Long ownerId, boolean onlyPublished) {
         List retList = new ArrayList<>();
         if (!onlyPublished) {
-            TypedQuery query = em.createQuery("select o.id from Dataset as o where o.owner.id =:ownerId order by o.id", Long.class);
-            query.setParameter("ownerId", ownerId);
-            return query.getResultList();
+            return em.createNamedQuery("Dataset.findIdByOwnerId")
+                    .setParameter("ownerId", ownerId)
+                    .getResultList();
         } else {
-            TypedQuery query = em.createQuery("select object(o) from Dataset as o where o.owner.id =:ownerId order by o.id", Dataset.class);
-            query.setParameter("ownerId", ownerId);
-            for (Dataset ds : query.getResultList()) {
+            List results = em.createNamedQuery("Dataset.findByOwnerId")
+                    .setParameter("ownerId", ownerId).getResultList();
+            for (Dataset ds : results) {
                 if (ds.isReleased() && !ds.isDeaccessioned()) {
                     retList.add(ds.getId());
                 }
@@ -288,8 +288,8 @@ public Long getMaximumExistingDatafileIdentifier(Dataset dataset) {
         Long dsId = dataset.getId();
         if (dsId != null) {
             try {
-                idResults = em.createNamedQuery("Dataset.findByOwnerIdentifier")
-                                .setParameter("owner_id", dsId).getResultList();
+                idResults = em.createNamedQuery("Dataset.findIdByOwnerId")
+                                .setParameter("ownerId", dsId).getResultList();
             } catch (NoResultException ex) {
                 logger.log(Level.FINE, "No files found in dataset id {0}. Returning a count of zero.", dsId);
                 return zeroFiles;
@@ -731,9 +731,7 @@ public void callFinalizePublishCommandAsynchronously(Long datasetId, CommandCont
         }
         logger.fine("Running FinalizeDatasetPublicationCommand, asynchronously");
         Dataset theDataset = find(datasetId);
-        String nonNullDefaultIfKeyNotFound = "";
-        String doiProvider = ctxt.settings().getValueForKey(SettingsServiceBean.Key.DoiProvider, nonNullDefaultIfKeyNotFound);
-        commandEngine.submit(new FinalizeDatasetPublicationCommand(theDataset, doiProvider, request, isPidPrePublished));
+        commandEngine.submit(new FinalizeDatasetPublicationCommand(theDataset, request, isPidPrePublished));
     }
     
     /*
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
index 7e4f4ecde39..b8f1f636541 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -2,27 +2,26 @@
 
 import edu.harvard.iq.dataverse.util.MarkupChecker;
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
+import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.DateUtil;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 import java.io.Serializable;
-import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import javax.json.Json;
+import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
 import javax.persistence.CascadeType;
@@ -294,7 +293,7 @@ public String getVersionDate() {
         if (this.lastUpdateTime == null){
             return null; 
         }
-        return new SimpleDateFormat("MMMM d, yyyy").format(lastUpdateTime);
+        return DateUtil.formatDate(lastUpdateTime);
     }
 
     public String getVersionYear() {
@@ -481,6 +480,24 @@ public boolean isMinorUpdate() {
         return true;
     }
     
+    public boolean isHasPackageFile(){
+        if (this.fileMetadatas.isEmpty()){
+            return false;
+        }
+        if(this.fileMetadatas.size() > 1){
+            return false;
+        }
+        return this.fileMetadatas.get(0).getDataFile().getContentType().equals(DataFileServiceBean.MIME_TYPE_PACKAGE_FILE);
+    }
+
+    public boolean isHasNonPackageFile(){
+        if (this.fileMetadatas.isEmpty()){
+            return false;
+        }
+        // The presence of any non-package file means that HTTP Upload was used (no mixing allowed) so we just check the first file.
+        return !this.fileMetadatas.get(0).getDataFile().getContentType().equals(DataFileServiceBean.MIME_TYPE_PACKAGE_FILE);
+    }
+
     public void updateDefaultValuesFromTemplate(Template template) {
         if (!template.getDatasetFields().isEmpty()) {
             this.setDatasetFields(this.copyDatasetFields(template.getDatasetFields()));
@@ -610,6 +627,27 @@ public String getDescription() {
         return "";
     }
 
+    public List getDescriptions() {
+        List descriptions = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.description)) {
+                String descriptionString = "";
+                if (dsf.getDatasetFieldCompoundValues() != null && !dsf.getDatasetFieldCompoundValues().isEmpty()) {
+                    for (DatasetFieldCompoundValue descriptionValue : dsf.getDatasetFieldCompoundValues()) {
+                        for (DatasetField subField : descriptionValue.getChildDatasetFields()) {
+                            if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.descriptionText) && !subField.isEmptyForDisplay()) {
+                                descriptionString = subField.getValue();
+                            }
+                        }
+                        logger.log(Level.FINE, "pristine description: {0}", descriptionString);
+                        descriptions.add(descriptionString);
+                    }
+                }
+            }
+        }
+        return descriptions;
+    }
+
     /**
      * @return Strip out all A string with the description of the dataset that
      * has been passed through the stripAllTags method to remove all HTML tags.
@@ -618,6 +656,14 @@ public String getDescriptionPlainText() {
         return MarkupChecker.stripAllTags(getDescription());
     }
 
+    public List getDescriptionsPlainText() {
+        List plainTextDescriptions = new ArrayList<>();
+        for (String htmlDescription : getDescriptions()) {
+            plainTextDescriptions.add(MarkupChecker.stripAllTags(htmlDescription));
+        }
+        return plainTextDescriptions;
+    }
+
     /**
      * @return A string with the description of the dataset that has been passed
      * through the escapeHtml method to change the "less than" sign to "<"
@@ -720,7 +766,50 @@ public List getDatasetAuthors() {
         }
         return retList;
     }
-    
+
+    public List getFunders() {
+        List retList = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributor)) {
+                boolean addFunder = false;
+                for (DatasetFieldCompoundValue contributorValue : dsf.getDatasetFieldCompoundValues()) {
+                    String contributorName = null;
+                    String contributorType = null;
+                    for (DatasetField subField : contributorValue.getChildDatasetFields()) {
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorName)) {
+                            contributorName = subField.getDisplayValue();
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorType)) {
+                            contributorType = subField.getDisplayValue();
+                            // TODO: Consider how this will work in French, Chinese, etc.
+                            String funderString = "Funder";
+                            if (funderString.equals(contributorType)) {
+                                addFunder = true;
+                            }
+                        }
+                    }
+                    if (addFunder) {
+                        retList.add(contributorName);
+                    }
+                }
+            }
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumber)) {
+                for (DatasetFieldCompoundValue grantObject : dsf.getDatasetFieldCompoundValues()) {
+                    for (DatasetField subField : grantObject.getChildDatasetFields()) {
+                        // It would be nice to do something with grantNumberValue (the actual number) but schema.org doesn't support it.
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumberAgency)) {
+                            String grantAgency = subField.getDisplayValue();
+                            if (grantAgency != null && !grantAgency.isEmpty()) {
+                                retList.add(grantAgency);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return retList;
+    }
+
     public List getTimePeriodsCovered() {
         List  retList = new ArrayList<>();
         for (DatasetField dsf : this.getDatasetFields()) {
@@ -854,7 +943,8 @@ public List getLanguages() {
 		}
 		return languages;
 	}
-	
+
+        // TODO: consider calling the newer getSpatialCoverages method below with the commaSeparated boolean set to true.
 	public List getSpatialCoverages() {
 		List retList = new ArrayList<>();
 		for (DatasetField dsf : this.getDatasetFields()) {
@@ -896,19 +986,100 @@ public List getSpatialCoverages() {
 		}
 		return retList;
     }
- 
+
+    public List getSpatialCoverages(boolean commaSeparated) {
+        List retList = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.geographicCoverage)) {
+                for (DatasetFieldCompoundValue geoValue : dsf.getDatasetFieldCompoundValues()) {
+                    Map coverageHash = new HashMap<>();
+                    for (DatasetField subField : geoValue.getChildDatasetFields()) {
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.country)) {
+                            if (!subField.isEmptyForDisplay()) {
+                                coverageHash.put(DatasetFieldConstant.country, subField.getValue());
+                            }
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.state)) {
+                            if (!subField.isEmptyForDisplay()) {
+                                coverageHash.put(DatasetFieldConstant.state, subField.getValue());
+                            }
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.city)) {
+                            if (!subField.isEmptyForDisplay()) {
+                                coverageHash.put(DatasetFieldConstant.city, subField.getValue());
+                            }
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.otherGeographicCoverage)) {
+                            if (!subField.isEmptyForDisplay()) {
+                                coverageHash.put(DatasetFieldConstant.otherGeographicCoverage, subField.getValue());
+                            }
+                        }
+                    }
+                    if (!coverageHash.isEmpty()) {
+                        List coverageSorted = sortSpatialCoverage(coverageHash);
+                        if (commaSeparated) {
+                            retList.add(String.join(", ", coverageSorted));
+                        } else {
+                            retList.addAll(coverageSorted);
+                        }
+                    }
+                }
+            }
+        }
+        return retList;
+    }
+
+    private List sortSpatialCoverage(Map hash) {
+        List sorted = new ArrayList<>();
+        String city = hash.get(DatasetFieldConstant.city);
+        if (city != null) {
+            sorted.add(city);
+        }
+        String state = hash.get(DatasetFieldConstant.state);
+        if (state != null) {
+            sorted.add(state);
+        }
+        String country = hash.get(DatasetFieldConstant.country);
+        if (country != null) {
+            sorted.add(country);
+        }
+        String otherGeographicCoverage = hash.get(DatasetFieldConstant.otherGeographicCoverage);
+        if (otherGeographicCoverage != null) {
+            sorted.add(otherGeographicCoverage);
+        }
+        return sorted;
+    }
+
     /**
      * @return List of Strings containing the version's Keywords
      */
     public List getKeywords() {
         return getCompoundChildFieldValues(DatasetFieldConstant.keyword, DatasetFieldConstant.keywordValue);
     }
-    
-    /**
-     * @return List of Strings containing the version's PublicationCitations
-     */
-    public List getPublicationCitationValues() {
-        return getCompoundChildFieldValues(DatasetFieldConstant.publication, DatasetFieldConstant.publicationCitation);
+
+    public List getRelatedPublications() {
+        List relatedPublications = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.publication)) {
+                for (DatasetFieldCompoundValue publication : dsf.getDatasetFieldCompoundValues()) {
+                    DatasetRelPublication relatedPublication = new DatasetRelPublication();
+                    for (DatasetField subField : publication.getChildDatasetFields()) {
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationCitation)) {
+                            String citation = subField.getDisplayValue();
+                            relatedPublication.setText(citation);
+                        }
+                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationURL)) {
+                            // Prevent href and target=_blank from getting into Schema.org JSON-LD output.
+                            subField.getDatasetFieldType().setDisplayFormat("#VALUE");
+                            String url = subField.getDisplayValue();
+                            relatedPublication.setUrl(url);
+                        }
+                    }
+                    relatedPublications.add(relatedPublication);
+                }
+            }
+        }
+        return relatedPublications;
     }
     
     /**
@@ -1041,6 +1212,7 @@ public String getDistributorName() {
         return null;
     }
     
+    // TODO: Consider renaming this method since it's also used for getting the "provider" for Schema.org JSON-LD.
     public String getRootDataverseNameforCitation(){
                     //Get root dataverse name for Citation
         Dataverse root = this.getDataset().getOwner();
@@ -1351,7 +1523,10 @@ public String getPublicationDateAsString() {
     // released (published) version. This JSON fragment is generated for a 
     // specific released version - and we can have multiple released versions. 
     // So something will need to be modified to accommodate this. -- L.A.  
-    
+    /**
+     * We call the export format "Schema.org JSON-LD" and extensive Javadoc can
+     * be found in {@link SchemaDotOrgExporter}.
+     */
     public String getJsonLd() {
         // We show published datasets only for "datePublished" field below.
         if (!this.isPublished()) {
@@ -1364,6 +1539,8 @@ public String getJsonLd() {
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("@context", "http://schema.org");
         job.add("@type", "Dataset");
+        // Note that whenever you use "@id" you should also use "identifier" and vice versa.
+        job.add("@id", this.getDataset().getPersistentURL());
         job.add("identifier", this.getDataset().getPersistentURL());
         job.add("name", this.getTitle());
         JsonArrayBuilder authors = Json.createArrayBuilder();
@@ -1385,13 +1562,34 @@ public String getJsonLd() {
             if (!StringUtil.isEmpty(affiliation)) {
                 author.add("affiliation", affiliation);
             }
+            String identifierAsUrl = datasetAuthor.getIdentifierAsUrl();
+            if (identifierAsUrl != null) {
+                // It would be valid to provide an array of identifiers for authors but we have decided to only provide one.
+                author.add("@id", identifierAsUrl);
+                author.add("identifier", identifierAsUrl);
+            }
             authors.add(author);
         }
-        job.add("author", authors);
+        JsonArray authorsArray = authors.build();
+        /**
+         * "creator" is being added along side "author" (below) as an
+         * experiment. We think Google Dataset Search might like "creator"
+         * better".
+         */
+        job.add("creator", authorsArray);
+        /**
+         * "author" is still here for backward compatibility. Depending on how
+         * the "creator" experiment above goes, we may deprecate it in the
+         * future.
+         */
+        job.add("author", authorsArray);
         /**
          * We are aware that there is a "datePublished" field but it means "Date
          * of first broadcast/publication." This only makes sense for a 1.0
          * version.
+         *
+         * TODO: Should we remove the comment above about a 1.0 version? We
+         * included this "datePublished" field in Dataverse 4.8.4.
          */
         String datePublished = this.getDataset().getPublicationDateFormattedYYYYMMDD();
         if (datePublished != null) {
@@ -1405,7 +1603,18 @@ public String getJsonLd() {
          */
         job.add("dateModified", this.getPublicationDateAsString());
         job.add("version", this.getVersionNumber().toString());
-        job.add("description", this.getDescriptionPlainText());
+
+        JsonArrayBuilder descriptionsArray = Json.createArrayBuilder();
+        List descriptions = this.getDescriptionsPlainText();
+        for (String description : descriptions) {
+            descriptionsArray.add(description);
+        }
+        /**
+         * In Dataverse 4.8.4 "description" was a single string but now it's an
+         * array.
+         */
+        job.add("description", descriptionsArray);
+
         /**
          * "keywords" - contains subject(s), datasetkeyword(s) and topicclassification(s)
          * metadata fields for the version. -- L.A. 
@@ -1426,23 +1635,43 @@ public String getJsonLd() {
         }
         
         job.add("keywords", keywords);
-        
+
         /**
-         * citation: 
-         * (multiple) publicationCitation values, if present:
+         * citation: (multiple) related publication citation and URLs, if
+         * present.
+         *
+         * In Dataverse 4.8.4 "citation" was an array of strings but now it's an
+         * array of objects.
          */
-        
-        List publicationCitations = getPublicationCitationValues();
-        if (publicationCitations.size() > 0) {
-            JsonArrayBuilder citation = Json.createArrayBuilder();
-            for (String pubCitation : publicationCitations) {
-                //citationEntry.add("@type", "Dataset");
-                //citationEntry.add("text", pubCitation);
-                citation.add(pubCitation);
+        List relatedPublications = getRelatedPublications();
+        if (!relatedPublications.isEmpty()) {
+            JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder();
+            for (DatasetRelPublication relatedPub : relatedPublications) {
+                boolean addToArray = false;
+                String pubCitation = relatedPub.getText();
+                String pubUrl = relatedPub.getUrl();
+                if (pubCitation != null || pubUrl != null) {
+                    addToArray = true;
+                }
+                JsonObjectBuilder citationEntry = Json.createObjectBuilder();
+                citationEntry.add("@type", "CreativeWork");
+                if (pubCitation != null) {
+                    citationEntry.add("text", pubCitation);
+                }
+                if (pubUrl != null) {
+                    citationEntry.add("@id", pubUrl);
+                    citationEntry.add("identifier", pubUrl);
+                }
+                if (addToArray) {
+                    jsonArrayBuilder.add(citationEntry);
+                }
+            }
+            JsonArray jsonArray = jsonArrayBuilder.build();
+            if (!jsonArray.isEmpty()) {
+                job.add("citation", jsonArray);
             }
-            job.add("citation", citation);
         }
-        
+
         /**
          * temporalCoverage:
          * (if available)
@@ -1456,22 +1685,18 @@ public String getJsonLd() {
             }
             job.add("temporalCoverage", temporalCoverage);
         }
-        
-        /**
-         * spatialCoverage (if available)
-         * TODO
-         * (punted, for now - see #2243)
-         * 
-         */
-        
+
         /**
-         * funder (if available)
-         * TODO
-         * (punted, for now - see #2243)
+         * https://schema.org/version/3.4/ says, "Note that schema.org release
+         * numbers are not generally included when you use schema.org. In
+         * contexts (e.g. related standards work) when a particular release
+         * needs to be cited, this document provides the appropriate URL."
+         *
+         * For the reason above we decided to take out schemaVersion but we're
+         * leaving this Javadoc in here to remind us that we made this decision.
+         * We used to include "https://schema.org/version/3.3" in the output for
+         * "schemaVersion".
          */
-        
-        job.add("schemaVersion", "https://schema.org/version/3.3");
-        
         TermsOfUseAndAccess terms = this.getTermsOfUseAndAccess();
         if (terms != null) {
             JsonObjectBuilder license = Json.createObjectBuilder().add("@type", "Dataset");
@@ -1495,12 +1720,79 @@ public String getJsonLd() {
                 .add("url", SystemConfig.getDataverseSiteUrlStatic())
         );
 
+        String installationBrandName = BrandingUtil.getInstallationBrandName(getRootDataverseNameforCitation());
+        /**
+         * Both "publisher" and "provider" are included but they have the same
+         * values. Some services seem to prefer one over the other.
+         */
+        job.add("publisher", Json.createObjectBuilder()
+                .add("@type", "Organization")
+                .add("name", installationBrandName)
+        );
         job.add("provider", Json.createObjectBuilder()
                 .add("@type", "Organization")
-                .add("name", "Dataverse")
+                .add("name", installationBrandName)
         );
+
+        List funderNames = getFunders();
+        if (!funderNames.isEmpty()) {
+            JsonArrayBuilder funderArray = Json.createArrayBuilder();
+            for (String funderName : funderNames) {
+                JsonObjectBuilder funder = Json.createObjectBuilder();
+                funder.add("@type", "Organization");
+                funder.add("name", funderName);
+                funderArray.add(funder);
+            }
+            job.add("funder", funderArray);
+        }
+
+        boolean commaSeparated = true;
+        List spatialCoverages = getSpatialCoverages(commaSeparated);
+        if (!spatialCoverages.isEmpty()) {
+            JsonArrayBuilder spatialArray = Json.createArrayBuilder();
+            for (String spatialCoverage : spatialCoverages) {
+                spatialArray.add(spatialCoverage);
+            }
+            job.add("spatialCoverage", spatialArray);
+        }
+
+        List fileMetadatasSorted = getFileMetadatasSorted();
+        if (fileMetadatasSorted != null && !fileMetadatasSorted.isEmpty()) {
+            JsonArrayBuilder fileArray = Json.createArrayBuilder();
+            String dataverseSiteUrl = SystemConfig.getDataverseSiteUrlStatic();
+            for (FileMetadata fileMetadata : fileMetadatasSorted) {
+                JsonObjectBuilder fileObject = NullSafeJsonBuilder.jsonObjectBuilder();
+                String filePidUrlAsString = null;
+                URL filePidUrl = fileMetadata.getDataFile().getGlobalId().toURL();
+                if (filePidUrl != null) {
+                    filePidUrlAsString = filePidUrl.toString();
+                }
+                fileObject.add("@type", "DataDownload");
+                fileObject.add("name", fileMetadata.getLabel());
+                fileObject.add("fileFormat", fileMetadata.getDataFile().getContentType());
+                fileObject.add("contentSize", fileMetadata.getDataFile().getFilesize());
+                fileObject.add("description", fileMetadata.getDescription());
+                fileObject.add("@id", filePidUrlAsString);
+                fileObject.add("identifier", filePidUrlAsString);
+                String hideFilesBoolean = System.getProperty(SystemConfig.FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS);
+                if (hideFilesBoolean != null && hideFilesBoolean.equals("true")) {
+                    // no-op
+                } else {
+                    if (FileUtil.isPubliclyDownloadable(fileMetadata)) {
+                        String nullDownloadType = null;
+                        fileObject.add("contentUrl", dataverseSiteUrl + FileUtil.getFileDownloadUrlPath(nullDownloadType, fileMetadata.getDataFile().getId(), false));
+                    }
+                }
+                fileArray.add(fileObject);
+            }
+            job.add("distribution", fileArray);
+        }
         jsonLd = job.build().toString();
         return jsonLd;
     }
 
+    public String getLocaleLastUpdateTime() {
+        return DateUtil.formatDate(new Timestamp(lastUpdateTime.getTime()));
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
index 04eca2ff629..d1a8a0692ab 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDifference.java
@@ -196,77 +196,77 @@ private void getTermsDifferences() {
         changedTermsAccess = new ArrayList<>();
         if (newVersion.getTermsOfUseAndAccess() != null && originalVersion.getTermsOfUseAndAccess() != null) {
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.header");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()), StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()));
 
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()), StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()));
             }
 
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()).equals(StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()))) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()),
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()));
             }
@@ -274,75 +274,75 @@ private void getTermsDifferences() {
 
         if (newVersion.getTermsOfUseAndAccess() != null && originalVersion.getTermsOfUseAndAccess() == null) {
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()).isEmpty()) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.header");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "", StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfUse()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSpecialPermissions()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getRestrictions()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getCitationRequirements()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDepositorRequirements()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getConditions()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "", StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDisclaimer()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getTermsOfAccess()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getDataAccessPlace()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getOriginalArchive()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getAvailabilityStatus()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getContactForAccess()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getSizeOfCollection()));
             }
             if (!StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, "",
                         StringUtil.nullToEmpty(newVersion.getTermsOfUseAndAccess().getStudyCompletion()));
             }            
@@ -350,75 +350,75 @@ private void getTermsDifferences() {
 
         if (newVersion.getTermsOfUseAndAccess() == null && originalVersion.getTermsOfUseAndAccess() != null) {
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()).isEmpty()) {
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.header");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.header");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfUse()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel,
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConfidentialityDeclaration()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel,
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSpecialPermissions()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getRestrictions()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getCitationRequirements()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDepositorRequirements()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getConditions()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel,  StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDisclaimer()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getTermsOfAccess()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getDataAccessPlace()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getOriginalArchive()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getAvailabilityStatus()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getContactForAccess()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getSizeOfCollection()), "");
             }
             if (!StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()).isEmpty()){
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion");
                 changedTermsAccess = addToTermsChangedList(changedTermsAccess, diffLabel, 
                         StringUtil.nullToEmpty(originalVersion.getTermsOfUseAndAccess().getStudyCompletion()), "");
             }            
@@ -780,7 +780,7 @@ private void initDatasetFilesDifferencesList() {
                 fileMetadatasOriginal.remove(replacedFile);
                 datasetFileDifferenceItem fdi = selectFileMetadataDiffs(replacedFile, newFile);
                 datasetReplaceFileItem fdr = new datasetReplaceFileItem();
-                String diffLabel = ResourceBundle.getBundle("Bundle").getString("file.dataFilesTab.versions.replaced");
+                String diffLabel = BundleUtil.getStringFromBundle("file.dataFilesTab.versions.replaced");
                 fdr.setLeftColumn(diffLabel);
                 fdr.setFdi(fdi);
                 fdr.setFile1Id(replacedFile.getDataFile().getId().toString());
@@ -1371,7 +1371,8 @@ public void setFileProvFree2(String fileProvFree2) {
         }
         
         public String getFileRest1() {
-            return fileRest1;
+            String localeFileRest1 = BundleUtil.getStringFromBundle(fileRest1.toLowerCase().replace(" ", "_"));
+            return localeFileRest1;
         }
 
         public void setFileRest1(String fileRest1) {
@@ -1379,7 +1380,8 @@ public void setFileRest1(String fileRest1) {
         }
 
         public String getFileRest2() {
-            return fileRest2;
+            String localeFileRest2 = BundleUtil.getStringFromBundle(fileRest2.toLowerCase().replace(" ", "_"));
+            return localeFileRest2;
         }
 
         public void setFileRest2(String fileRest2) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 433477936d2..f74cb096d1b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -41,8 +41,10 @@
  */
 @NamedQueries({
     @NamedQuery(name = "Dataverse.ownedObjectsById", query = "SELECT COUNT(obj) FROM DvObject obj WHERE obj.owner.id=:id"),
+    @NamedQuery(name = "Dataverse.findAll", query = "SELECT d FROM Dataverse d order by d.name"),
     @NamedQuery(name = "Dataverse.findRoot", query = "SELECT d FROM Dataverse d where d.owner.id=null"),
     @NamedQuery(name = "Dataverse.findByAlias", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.alias)=:alias"),
+    @NamedQuery(name = "Dataverse.findByOwnerId", query="select object(o) from Dataverse as o where o.owner.id =:ownerId order by o.name"),
     @NamedQuery(name = "Dataverse.filterByAlias", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.alias) LIKE :alias order by dv.alias"),
     @NamedQuery(name = "Dataverse.filterByAliasNameAffiliation", query="SELECT dv FROM Dataverse dv WHERE (LOWER(dv.alias) LIKE :alias) OR (LOWER(dv.name) LIKE :name) OR (LOWER(dv.affiliation) LIKE :affiliation) order by dv.alias"),
     @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias")
@@ -151,7 +153,7 @@ public String getIndexableCategoryName() {
     private Set roles;
     
     @ManyToOne
-    @JoinColumn(nullable = false)
+    @JoinColumn(nullable = true)
     private DataverseRole defaultContributorRole;
 
     public DataverseRole getDefaultContributorRole() {
@@ -746,5 +748,4 @@ public boolean isAncestorOf( DvObject other ) {
         }
         return false;
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index dfe6e5e70c9..0085c395f1e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -8,6 +8,8 @@
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -83,8 +85,8 @@ public void initBreadcrumbs(DvObject dvObject) {
             if (dvObject.getId() != null) {
                 initBreadcrumbs(dvObject, null);
             } else {
-                initBreadcrumbs(dvObject.getOwner(), dvObject instanceof Dataverse ? JH.localize("newDataverse") : 
-                        dvObject instanceof Dataset ? JH.localize("newDataset") : null );
+                initBreadcrumbs(dvObject.getOwner(), dvObject instanceof Dataverse ? BundleUtil.getStringFromBundle("newDataverse") : 
+                        dvObject instanceof Dataset ? BundleUtil.getStringFromBundle("newDataset") : null );
             }
     }
     
@@ -217,6 +219,7 @@ private TreeNode getDataverseNode(Dataverse dataverse, TreeNode root, boolean ex
      */
     public String logout() {
         dataverseSession.setUser(null);
+        dataverseSession.setStatusDismissed(false);
 
         String redirectPage = navigationWrapper.getPageFromContext();
         try {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseLocaleBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseLocaleBean.java
index 4ac334bf50b..d771990be02 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseLocaleBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseLocaleBean.java
@@ -25,18 +25,21 @@ public class DataverseLocaleBean implements Serializable {
     {
         //Noticed that the NullPointerException was thrown from FacesContext.getCurrentInstance() while running the testcases(mvn:package).
         //Reason: the FacesContext is not initialized until the app starts. So, added the below if-condition
-        if(FacesContext.getCurrentInstance() == null)
-        {
+        if(FacesContext.getCurrentInstance() == null) {
+            localeCode = "en";
+        }
+        else if (FacesContext.getCurrentInstance().getViewRoot() == null ) {
+            localeCode = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale().getLanguage();
+        }
+        else if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage() == "en_US") {
             localeCode = "en";
         }
         else {
-            if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage() == "en_US") {
-                localeCode = "en";
-            } else {
-                localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage();
-            }
+            localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage();
         }
     }
+
+
     
     // Map from locale to display name eg     en -> English
     private Map dataverseLocales;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 3f8a7347cd4..0bd67f0f24e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -290,7 +290,7 @@ public String init() {
 
             ownerId = dataverse.getOwner() != null ? dataverse.getOwner().getId() : null;
         } else { // ownerId != null; create mode for a new child dataverse
-            editMode = EditMode.INFO;
+            editMode = EditMode.CREATE;
             dataverse.setOwner(dataverseService.find(ownerId));
             if (dataverse.getOwner() == null) {
                 return  permissionsWrapper.notFound();
@@ -408,7 +408,7 @@ public void edit(EditMode editMode) {
         this.editMode = editMode;
         if (editMode == EditMode.INFO) {
             setupForGeneralInfoEdit();
-            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataverse.edit.msg") , BundleUtil.getStringFromBundle("dataverse.edit.detailmsg")));
+            JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataverse.edit.msg"), BundleUtil.getStringFromBundle("dataverse.edit.detailmsg"));
         } else if (editMode == EditMode.FEATURED) {
             initFeaturedDataverses();
         }
@@ -691,6 +691,18 @@ public void editMetadataBlocks(boolean checkVal) {
             refreshAllMetadataBlocks();
         }
     }
+    
+    public String resetToInherit() {
+
+        setInheritMetadataBlockFromParent(true);
+        if (editMode.equals(DataversePage.EditMode.CREATE)) {;
+            refreshAllMetadataBlocks();
+            return null;
+        } else {
+            String retVal = save();
+            return retVal;
+        }
+    }
 
     public void cancelMetadataBlocks() {
         setInheritMetadataBlockFromParent(false);
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
index 4b80ee8104a..9d09d0580e2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseRoleServiceBean.java
@@ -10,16 +10,20 @@
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.inject.Named;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+//import javax.validation.constraints.NotNull;
 
 /**
  *
@@ -29,7 +33,7 @@
 @Named
 public class DataverseRoleServiceBean implements java.io.Serializable {
 
-    private static final Logger logger = Logger.getLogger(IndexServiceBean.class.getCanonicalName());
+    private static final Logger logger = Logger.getLogger(DataverseRoleServiceBean.class.getCanonicalName());
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
@@ -120,6 +124,13 @@ public DataverseRole findBuiltinRoleByAlias(String alias) {
             .setParameter("alias", alias)
             .getSingleResult();
     }
+    
+    public DataverseRole findCustomRoleByAliasAndOwner(String alias, Long ownerId) {
+        return em.createNamedQuery("DataverseRole.findCustomRoleByAliasAndOwner", DataverseRole.class)
+            .setParameter("alias", alias)
+            .setParameter("ownerId", ownerId)
+            .getSingleResult();
+    }
 
     public void revoke(Set roles, RoleAssignee assignee, DvObject defPoint) {
         for (DataverseRole role : roles) {
@@ -218,7 +229,7 @@ public Set rolesAssignments(DvObject dv) {
 
         return ras;
     }
-
+    
     /**
      * Retrieves the roles assignments for {@code user}, directly on {@code dv}.
      * No traversal on the containment hierarchy is done.
@@ -229,16 +240,37 @@ public Set rolesAssignments(DvObject dv) {
      * @see #roleAssignments(edu.harvard.iq.dataverse.DataverseUser,
      * edu.harvard.iq.dataverse.Dataverse)
      */
+    //public List directRoleAssignments(@NotNull RoleAssignee roas, @NotNull DvObject dvo) {
     public List directRoleAssignments(RoleAssignee roas, DvObject dvo) {
-        if (roas == null) {
-            throw new IllegalArgumentException("RoleAssignee cannot be null");
+        List unfiltered = em.createNamedQuery("RoleAssignment.listByAssigneeIdentifier", RoleAssignment.class).
+                            setParameter("assigneeIdentifier", roas.getIdentifier())
+                            .getResultList();
+        return unfiltered.stream().filter(roleAssignment -> Objects.equals(roleAssignment.getDefinitionPoint().getId(), dvo.getId())).collect(Collectors.toList());
+    }
+    
+    /**
+     * Retrieves the roles assignments for {@code user}, directly on {@code dv}.
+     * No traversal on the containment hierarchy is done.
+     *
+     * @param roleAssignees the user whose roles are given
+     * @param dvos the objects where the roles are defined.
+     * @return Set of roles defined for the user in the given dataverse.
+     * @see #roleAssignments(edu.harvard.iq.dataverse.DataverseUser,
+     * edu.harvard.iq.dataverse.Dataverse)
+     */
+    //public List directRoleAssignments(@NotNull Set roleAssignees, @NotNull Collection dvos) {
+    public List directRoleAssignments(Set roleAssignees, Collection dvos) {
+        if (dvos.isEmpty()) {
+            return new ArrayList<>();
         }
-        TypedQuery query = em.createNamedQuery(
-            "RoleAssignment.listByAssigneeIdentifier_DefinitionPointId",
-            RoleAssignment.class);
-        query.setParameter("assigneeIdentifier", roas.getIdentifier());
-        query.setParameter("definitionPointId", dvo.getId());
-        return query.getResultList();
+        
+        List raIds = roleAssignees.stream().map(roas -> roas.getIdentifier()).collect(Collectors.toList());
+        List dvoIds = dvos.stream().filter(dvo -> !(dvo.getId() == null)).map(dvo -> dvo.getId()).collect(Collectors.toList());
+        
+        return em.createNamedQuery("RoleAssignment.listByAssigneeIdentifiers", RoleAssignment.class)
+                        .setParameter("assigneeIdentifiers", raIds)
+                        .setParameter("definitionPointIds", dvoIds)
+                        .getResultList();
     }
 
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 78f57603779..ce90ff4b8c2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -5,7 +5,11 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.Group;
+import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
@@ -14,29 +18,29 @@
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.concurrent.Future;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.ws.rs.core.Response;
 
 /**
  *
@@ -50,6 +54,9 @@ public class DataverseServiceBean implements java.io.Serializable {
     @EJB
     IndexServiceBean indexService;
 
+    @EJB
+    AuthenticationServiceBean authService;
+    
     @EJB
     DatasetServiceBean datasetService;
     
@@ -59,6 +66,12 @@ public class DataverseServiceBean implements java.io.Serializable {
     @EJB
     DatasetLinkingServiceBean datasetLinkingService;
     
+    @EJB
+    GroupServiceBean groupService;
+    
+    @EJB
+    DataverseRoleServiceBean rolesService;
+    
     @EJB
     PermissionServiceBean permissionService;
     
@@ -88,7 +101,7 @@ public Dataverse find(Object pk) {
     }
 
     public List findAll() {
-        return em.createQuery("select object(o) from Dataverse as o order by o.name", Dataverse.class).getResultList();
+        return em.createNamedQuery("Dataverse.findAll").getResultList();
     }
 
     /**
@@ -129,8 +142,7 @@ public List findDataverseIdsForIndexing(boolean skipIndexed) {
     }
 
     public List findByOwnerId(Long ownerId) {
-        String qr = "select object(o) from Dataverse as o where o.owner.id =:ownerId order by o.name";
-        return em.createQuery(qr, Dataverse.class).setParameter("ownerId", ownerId).getResultList();
+        return em.createNamedQuery("Dataverse.findByOwnerId").setParameter("ownerId", ownerId).getResultList();
     }
     
     public List findIdsByOwnerId(Long ownerId) {
@@ -628,4 +640,142 @@ public List findAllDataverseDatasetChildren(Long dvId) {
             return datasetChildren;
         }
     }
-}  
+    
+    public String addRoleAssignmentsToChildren(Dataverse owner, ArrayList rolesToInherit,
+            boolean inheritAllRoles) {
+        /*
+         * This query recursively finds all Dataverses that are inside/children of the
+         * specified one. It recursively finds dvobjects of dtype 'Dataverse' whose
+         * owner_id equals an id already in the list and then returns the list of ids
+         * found, excluding the id of the original specified Dataverse.
+         */
+        String qstr = "WITH RECURSIVE path_elements AS ((" + " SELECT id, dtype FROM dvobject WHERE id in ("
+                + owner.getId() + "))" + " UNION\n"
+                + " SELECT o.id, o.dtype FROM path_elements p, dvobject o WHERE o.owner_id = p.id and o.dtype='Dataverse') "
+                + "SELECT id FROM path_elements WHERE id !=" + owner.getId() + ";";
+
+        List childIds;
+        try {
+            childIds = em.createNativeQuery(qstr).getResultList();
+        } catch (Exception ex) {
+            childIds = null;
+        }
+
+        // Set up to track the set of users/groups that get assigned a role and those
+        // that don't
+        JsonArrayBuilder usedNames = Json.createArrayBuilder();
+        JsonArrayBuilder unusedNames = Json.createArrayBuilder();
+        // Set up to track the list of dataverses, by id and alias, that are traversed.
+        JsonArrayBuilder dataverseIds = Json.createArrayBuilder();
+        JsonArrayBuilder dataverseAliases = Json.createArrayBuilder();
+        // Get the Dataverses for the returned ids
+
+        List children = new ArrayList();
+
+        for (int i = 0; i < childIds.size(); i++) {
+            Integer childId = childIds.get(i);
+            Dataverse child = find(new Long(childId.longValue()));
+            if (child != null) {
+                // Add to the list of Dataverses
+                children.add(child);
+                // Add ids and aliases to the tracking arrays
+                dataverseIds.add(childId.longValue());
+                dataverseAliases.add(child.getAlias());
+            }
+        }
+        // Find the role assignments on the specified Dataverse
+        List allRAsOnOwner = rolesService.directRoleAssignments(owner);
+
+        // Create a list of just the inheritable role assignments on the original
+        // dataverse
+        List inheritableRAsOnOwner = new ArrayList();
+        for (RoleAssignment role : allRAsOnOwner) {
+            if (inheritAllRoles || rolesToInherit.contains(role.getRole().getAlias())) {
+                //Only supporting built-in/non-dataverse-specific custom roles. Custom roles all have an owner.
+                if(role.getRole().getOwner()==null) {
+                    inheritableRAsOnOwner.add(role);
+                }
+            }
+        }
+
+        String privateUrlToken = null;
+        // Create lists of the existing inheritable roles for each child Dataverse
+        Map> existingRAs = new HashMap>();
+        for (Dataverse childDv : children) {
+            List allRAsOnChild = rolesService.directRoleAssignments(childDv);
+            List inheritableRoles = new ArrayList();
+            for (RoleAssignment role : allRAsOnChild) {
+                if (inheritAllRoles || rolesToInherit.contains(role.getRole().getAlias())) {
+                    inheritableRoles.add(role);
+                }
+            }
+            existingRAs.put(childDv.getId(), inheritableRoles);
+        }
+
+        for (RoleAssignment roleAssignment : inheritableRAsOnOwner) {
+            DataverseRole inheritableRole = roleAssignment.getRole();
+            String identifier = roleAssignment.getAssigneeIdentifier();
+            if (identifier.startsWith(AuthenticatedUser.IDENTIFIER_PREFIX)) {
+                // The RoleAssignment is for an individual user
+                // Add their name to the tracking list
+                usedNames.add(identifier);
+                // Strip the Identifier prefix so we can retrieve the user
+                identifier = identifier.substring(AuthenticatedUser.IDENTIFIER_PREFIX.length());
+                AuthenticatedUser roleUser = authService.getAuthenticatedUser(identifier);
+                // Now loop over all children and add the roleUser in this role if they don't
+                // yet have this role
+                for (Dataverse childDv : children) {
+                    try {
+                        RoleAssignment ra = new RoleAssignment(inheritableRole, roleUser, childDv, privateUrlToken);
+                        if (!existingRAs.get(childDv.getId()).contains(ra)) {
+                            rolesService.save(ra);
+                        }
+                    } catch (Exception e) {
+                        logger.warning("Unable to assign " + roleAssignment.getAssigneeIdentifier()
+                                + "as an admin for new Dataverse: " + childDv.getName());
+                        logger.warning(e.getMessage());
+                        throw (e);
+                    }
+                }
+            } else if (identifier.startsWith(Group.IDENTIFIER_PREFIX)) {
+                // The role assignment is for a group
+                usedNames.add(identifier);
+                identifier = identifier.substring(Group.IDENTIFIER_PREFIX.length());
+                Group roleGroup = groupService.getGroup(identifier);
+                if (roleGroup != null) {
+                    for (Dataverse childDv : children) {
+                        try {
+                            RoleAssignment ra = new RoleAssignment(inheritableRole, roleGroup, childDv,
+                                    privateUrlToken);
+                            if (!existingRAs.get(childDv.getId()).contains(ra)) {
+                                rolesService.save(ra);
+                            }
+                        } catch (Exception e) {
+                            logger.warning("Unable to assign " + roleAssignment.getAssigneeIdentifier()
+                                    + "as an admin for new Dataverse: " + childDv.getName());
+                            logger.warning(e.getMessage());
+                            throw (e);
+                        }
+                    }
+                } else {
+                    // Add any groups of types not yet supported
+                    unusedNames.add(identifier);
+                }
+            } else {
+                // Add any other types of entity found (not user or group) that aren't supported
+                unusedNames.add(identifier);
+            }
+        }
+        /*
+         * Report the list of Dataverses affected and the set of users/groups that
+         * should now have admin roles on them (they may already have had them) and any
+         * entities that had an admin role on the specified dataverse which were not
+         * handled. Add this to the log and the API return message.
+         */
+        String result = Json.createObjectBuilder().add("Dataverses Updated", dataverseIds)
+                .add("Updated Dataverse Aliases", dataverseAliases).add("Assignments added for", usedNames)
+                .add("Assignments not added for", unusedNames).build().toString();
+        logger.info(result);
+        return (result);
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java b/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
index 54945a64cbd..7fc80542daa 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
@@ -19,17 +19,20 @@
 @SessionScoped
 public class DataverseSession implements Serializable{
     
-	private User user;
-	
-	@EJB
-	PermissionServiceBean permissionsService;
-	
-	@EJB
-	BuiltinUserServiceBean usersSvc;
+    /* Note that on logout, variables must be cleared manually in DataverseHeaderFragment*/
+    private User user;
+
+    @EJB
+    PermissionServiceBean permissionsService;
+
+    @EJB
+    BuiltinUserServiceBean usersSvc;
 	
     @EJB 
     ActionLogServiceBean logSvc;
     
+    private boolean statusDismissed = false;
+    
     public User getUser() {
         if ( user == null ) {
             user = GuestUser.get();
@@ -46,8 +49,16 @@ public void setUser(User aUser) {
         this.user = aUser;
     }
 
-	public StaticPermissionQuery on( Dataverse d ) {
-		return permissionsService.userOn(user, d);
-	}
+    public boolean isStatusDismissed() {
+        return statusDismissed;
+    }
+    
+    public void setStatusDismissed(boolean status) {
+        statusDismissed = status; //MAD: Set to true to enable code!
+    }
+    
+    public StaticPermissionQuery on( Dataverse d ) {
+            return permissionsService.userOn(user, d);
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObject.java b/src/main/java/edu/harvard/iq/dataverse/DvObject.java
index 9c091e2d34c..6286985ff76 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DvObject.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DvObject.java
@@ -29,7 +29,9 @@
             query = "SELECT o FROM DvObject o, AlternativePersistentIdentifier a  WHERE o.id = a.dvObject.id and a.identifier=:identifier and a.authority=:authority and a.protocol=:protocol and o.dtype=:dtype"),
 
     @NamedQuery(name = "DvObject.findByProtocolIdentifierAuthority",
-            query = "SELECT o FROM DvObject o WHERE o.identifier=:identifier and o.authority=:authority and o.protocol=:protocol")
+            query = "SELECT o FROM DvObject o WHERE o.identifier=:identifier and o.authority=:authority and o.protocol=:protocol"),
+    @NamedQuery(name = "DvObject.findByOwnerId", 
+                query = "SELECT o FROM DvObject o WHERE o.owner.id=:ownerId")
 })
 @Entity
 // Inheritance strategy "JOINED" will create 4 db tables - 
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
index 7fbca815f27..2ff41ba134a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
@@ -59,6 +59,11 @@ public DvObject findDvObject(Long id) {
     public List findAll() {
         return em.createNamedQuery("DvObject.findAll", DvObject.class).getResultList();
     }
+    
+    
+    public List findByOwnerId(Long ownerId) {
+        return em.createNamedQuery("DvObject.findByOwnerId").setParameter("ownerId", ownerId).getResultList();
+    }
 
     // FIXME This type-by-string has to go, in favor of passing a class parameter.
     public DvObject findByGlobalId(String globalIdString, String typeString) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
index 61a6519b0fd..e4cd115bccb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -9,24 +9,30 @@
 import edu.harvard.iq.dataverse.datasetutility.FileReplaceException;
 import edu.harvard.iq.dataverse.datasetutility.FileReplacePageHelper;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleUtil;
+import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteDataFileCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.RequestRsyncScriptCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetThumbnailCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.ingest.IngestRequest;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.ingest.IngestUtil;
 import edu.harvard.iq.dataverse.search.FileView;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.EjbUtil;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -67,6 +73,8 @@
 import java.util.logging.Level;
 import javax.faces.event.AjaxBehaviorEvent;
 import javax.faces.event.FacesEvent;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.primefaces.context.RequestContext;
 
@@ -118,7 +126,8 @@ public enum FileEditMode {
     @Inject PermissionsWrapper permissionsWrapper;
     @Inject FileDownloadHelper fileDownloadHelper;
     @Inject ProvPopupFragmentBean provPopupFragmentBean;
-
+    @Inject
+    SettingsWrapper settingsWrapper;
     private final DateFormat displayDateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);
 
     private Dataset dataset = new Dataset();
@@ -476,7 +485,10 @@ public String init() {
         if (!permissionService.on(dataset).has(Permission.EditDataset)) {
             return permissionsWrapper.notAuthorized();
         }
-        
+
+        // TODO: Think about why this call to populateFileMetadatas was added. It seems like it isn't needed after all.
+//        populateFileMetadatas();
+
         // -------------------------------------------
         //  Is this a file replacement operation?
         // -------------------------------------------
@@ -535,7 +547,7 @@ public String init() {
             logger.fine("The page is called with " + selectedFileIdsList.size() + " file ids.");
 
             populateFileMetadatas();
-
+            setUpRsync();
             // and if no filemetadatas can be found for the specified file ids 
             // and version id - same deal, send them to the "not found" page. 
             // (at least for now; ideally, we probably want to show them a page 
@@ -555,9 +567,17 @@ public String init() {
         }
         
         saveEnabled = true; 
+        if (mode == FileEditMode.UPLOAD && workingVersion.getFileMetadatas().isEmpty() && settingsWrapper.isRsyncUpload())  {
+            setUpRsync();
+        }
 
         if (mode == FileEditMode.UPLOAD) {
-            JH.addMessage(FacesMessage.SEVERITY_INFO, getBundleString("dataset.message.uploadFiles"));
+            if (settingsWrapper.getUploadMethodsCount() == 1){
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.uploadFiles.label"), BundleUtil.getStringFromBundle("dataset.message.uploadFilesSingle.message", Arrays.asList(systemConfig.getGuidesBaseUrl(), systemConfig.getGuidesVersion())));
+            } else if (settingsWrapper.getUploadMethodsCount() > 1) {
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.uploadFiles.label"), BundleUtil.getStringFromBundle("dataset.message.uploadFilesMultiple.message", Arrays.asList(systemConfig.getGuidesBaseUrl(), systemConfig.getGuidesVersion())));
+            }
+            
         }
         
         if (settingsService.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)){
@@ -826,10 +846,14 @@ public void deleteReplacementFile() throws FileReplaceException{
      */
     private String getBundleString(String msgName){
         
-       return ResourceBundle.getBundle("Bundle").getString(msgName);
+       return BundleUtil.getStringFromBundle(msgName);
     }
     
-    
+    // This deleteFilesCompleted method is used in editFilesFragment.xhtml
+    public void deleteFilesCompleted(){
+        
+    }
+        
     public void deleteFiles() {
         logger.fine("entering bulk file delete (EditDataFilesPage)");
         if (isFileReplaceOperation()){
@@ -975,7 +999,10 @@ private void removeDataFileFromList(List dfs, DataFile dfToDelete) {
 
     public String saveWithTermsOfUse() {
         logger.fine("saving terms of use, and the dataset version");
-        datasetUpdateRequired = true; 
+        //Set update required only if dataset already exists
+        if (dataset.getId() != null){
+             datasetUpdateRequired = true; 
+        }
         return save();
     }
     
@@ -1031,7 +1058,7 @@ public String saveReplacementFile() throws FileReplaceException{
     
     public String save() {
         
-      
+        
         /*
         // Validate
         Set constraintViolations = workingVersion.validate();
@@ -1071,6 +1098,27 @@ public String save() {
         int nExpectedFilesTotal = nOldFiles + nNewFiles; 
         
         if (nNewFiles > 0) {
+            //SEK 10/15/2018 only apply the following tests if dataset has already been saved.
+            if (dataset.getId() != null) {
+                Dataset lockTest = datasetService.find(dataset.getId());
+                //SEK 09/19/18 Get Dataset again to test for lock just in case the user downloads the rsync script via the api while the 
+                // edit files page is open and has already loaded a file in http upload for Dual Mode
+                if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload) || lockTest.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+                    logger.log(Level.INFO, "Couldn''t save dataset: {0}", "DCM script has been downloaded for this dataset. Additonal files are not permitted."
+                            + "");
+                    populateDatasetUpdateFailureMessage();
+                    return null;
+                }
+                for (DatasetVersion dv : lockTest.getVersions()) {
+                    if (dv.isHasPackageFile()) {
+                        logger.log(Level.INFO, ResourceBundle.getBundle("Bundle").getString("file.api.alreadyHasPackageFile")
+                                + "");
+                        populateDatasetUpdateFailureMessage();
+                        return null;
+                    }
+                }
+            }
+                                
             // Try to save the NEW files permanently: 
             List filesAdded = ingestService.saveAndAddFilesToDataset(workingVersion, newFiles);
             
@@ -1349,12 +1397,12 @@ private void populateDatasetUpdateFailureMessage(){
     
     
     private String returnToDraftVersion(){      
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString() + "&version=DRAFT&faces-redirect=true";    
+         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString() + "&version=DRAFT&faces-redirect=true";    
     }
     
     private String returnToDatasetOnly(){
          dataset = datasetService.find(dataset.getId());
-         return "/dataset.xhtml?persistentId=" + dataset.getGlobalIdString()  +  "&faces-redirect=true";       
+         return "/dataset.xhtml?persistentId=" + dataset.getGlobalId().asString()  +  "&faces-redirect=true";       
     }
     
     private String returnToFileLandingPage() {
@@ -1663,12 +1711,98 @@ public void uploadStarted() {
         // uploadStarted() is triggered by PrimeFaces  R submit(Command aCommand) throws CommandException {
                 public ExplicitGroupServiceBean explicitGroups() {
                     return explicitGroups;
                 }
+                
+                @Override
+                public GroupServiceBean groups() {
+                    return groups;
+                }
 
                 @Override
                 public RoleAssigneeServiceBean roleAssignees() {
@@ -456,6 +475,11 @@ public MapLayerMetadataServiceBean mapLayerMetadata() {
                 public DataCaptureModuleServiceBean dataCaptureModule() {
                     return dataCaptureModule;
                 }
+                
+                @Override
+                public FileDownloadServiceBean fileDownload() {
+                    return fileDownloadService;
+                }
 
             };
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
index befdc3a9eeb..33d1305c8bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
@@ -228,7 +228,7 @@ public void writeGuestbookAndStartDownload(GuestbookResponse guestbookResponse)
          boolean valid = validateGuestbookResponse(guestbookResponse);
 
          if (!valid) {
-             JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("dataset.message.validationError"));
+             JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
          } else {
              requestContext.execute("PF('downloadPopup').hide()");
              guestbookResponse.setDownloadtype("Download");
@@ -297,7 +297,22 @@ public void writeGuestbookAndLaunchExploreTool(GuestbookResponse guestbookRespon
          }
          fileDownloadService.explore(guestbookResponse, fmd, externalTool);
          requestContext.execute("PF('downloadPopup').hide()");
-     }
+    }
+     
+    public void writeGuestbookAndLaunchPackagePopup(GuestbookResponse guestbookResponse) {
+        RequestContext requestContext = RequestContext.getCurrentInstance();
+        boolean valid = validateGuestbookResponse(guestbookResponse);
+
+        if (!valid) {
+            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
+        } else {
+            requestContext.execute("PF('downloadPopup').hide()");
+            requestContext.execute("PF('downloadPackagePopup').show()");
+            requestContext.execute("handleResizeDialog('downloadPackagePopup')");
+
+            fileDownloadService.writeGuestbookResponseRecord(guestbookResponse);
+        }
+    }
 
     public String startWorldMapDownloadLink(GuestbookResponse guestbookResponse, FileMetadata fmd){
         
@@ -336,10 +351,8 @@ public void clearRequestAccessFiles(){
     public void addMultipleFilesForRequestAccess(DataFile dataFile) {
         this.filesForRequestAccess.add(dataFile);
 
-     }
+    }
         
-    
-    
     private String selectedFileId = null;
 
     public String getSelectedFileId() {
@@ -453,7 +466,7 @@ public void requestAccessMultiple(List files) {
              }
          }
          if ( notificationFile != null){
-             fileDownloadService.sendRequestFileAccessNotification(notificationFile.getOwner(), notificationFile.getId()); 
+             fileDownloadService.sendRequestFileAccessNotification(notificationFile.getOwner(), notificationFile.getId(), (AuthenticatedUser) session.getUser()); 
          }
      }
     
@@ -473,7 +486,7 @@ private void processRequestAccess(DataFile file, Boolean sendNotification) {
              file.getFileAccessRequesters().add((AuthenticatedUser) session.getUser());
              // create notification if necessary
              if (sendNotification) {
-                 fileDownloadService.sendRequestFileAccessNotification(file.getOwner(), file.getId());
+                 fileDownloadService.sendRequestFileAccessNotification(file.getOwner(), file.getId(), (AuthenticatedUser) session.getUser());
              }
          }
      } 
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
index 73458433bb8..d859a5f057e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
@@ -145,14 +145,19 @@ public void writeGuestbookAndStartFileDownload(GuestbookResponse guestbookRespon
         logger.fine("issued file download redirect for datafile "+guestbookResponse.getDataFile().getId());
     }
 
+    public void writeGuestbookResponseRecord(GuestbookResponse guestbookResponse, FileMetadata fileMetadata, String format) {
+        if(!fileMetadata.getDatasetVersion().isDraft()){
+            guestbookResponse = guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, format);
+            writeGuestbookResponseRecord(guestbookResponse);
+        }
+    }
+    
     public void writeGuestbookResponseRecord(GuestbookResponse guestbookResponse) {
-
         try {
             CreateGuestbookResponseCommand cmd = new CreateGuestbookResponseCommand(dvRequestService.getDataverseRequest(), guestbookResponse, guestbookResponse.getDataset());
             commandEngine.submit(cmd);
         } catch (CommandException e) {
             //if an error occurs here then download won't happen no need for response recs...
-
         }
     }
     
@@ -403,18 +408,18 @@ public void downloadCitationBibtex(FileMetadata fileMetadata, Dataset dataset, b
         } else {
             citation= new DataCitation(fileMetadata, direct);
         }
-        
+        //SEK 12/3/2018 changing this to open the json in a new tab. 
         FacesContext ctx = FacesContext.getCurrentInstance();
         HttpServletResponse response = (HttpServletResponse) ctx.getExternalContext().getResponse();
-        response.setContentType("application/download");
+        response.setContentType("application/json");
 
         String fileNameString;
         if (fileMetadata == null || fileMetadata.getLabel() == null) {
             // Dataset-level citation:
-            fileNameString = "attachment;filename=" + getFileNameDOI(citation.getPersistentId()) + ".bib";
+            fileNameString = "inline;filename=" + getFileNameDOI(citation.getPersistentId()) + ".bib";
         } else {
             // Datafile-level citation:
-            fileNameString = "attachment;filename=" + getFileNameDOI(citation.getPersistentId()) + "-" + FileUtil.getCiteDataFileFilename(citation.getFileTitle(), FileUtil.FileCitationExtension.BIBTEX);
+            fileNameString = "inline;filename=" + getFileNameDOI(citation.getPersistentId()) + "-" + FileUtil.getCiteDataFileFilename(citation.getFileTitle(), FileUtil.FileCitationExtension.BIBTEX);
         }
         response.setHeader("Content-Disposition", fileNameString);
 
@@ -445,9 +450,9 @@ public boolean requestAccess(Long fileId) {
         return false;
     }    
     
-    public void sendRequestFileAccessNotification(Dataset dataset, Long fileId) {
+    public void sendRequestFileAccessNotification(Dataset dataset, Long fileId, AuthenticatedUser requestor) {
         permissionService.getUsersWithPermissionOn(Permission.ManageDatasetPermissions, dataset).stream().forEach((au) -> {
-            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REQUESTFILEACCESS, fileId);
+            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REQUESTFILEACCESS, fileId, null, requestor);
         });
 
     }    
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
index 6ad4eb34ddd..cdce9db23ba 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
@@ -7,7 +7,6 @@
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -32,9 +31,10 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
+
+import edu.harvard.iq.dataverse.util.DateUtil;
 import org.hibernate.validator.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
-import org.apache.commons.lang.StringEscapeUtils;
 
 
 /**
@@ -45,7 +45,6 @@
 @Entity
 public class FileMetadata implements Serializable {
     private static final long serialVersionUID = 1L;
-    private static final DateFormat displayDateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);    
     private static final Logger logger = Logger.getLogger(FileMetadata.class.getCanonicalName());
 
 
@@ -319,7 +318,7 @@ public String getFileDateToDisplay() {
             }
         }
         if (fileDate != null) {
-            return displayDateFormat.format(fileDate);
+            return DateUtil.formatDate(fileDate);
         }
         return "";
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
index f9de18e33fb..4a7b3ff68b5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FilePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
@@ -319,7 +319,7 @@ public String restrictFile(boolean restricted) throws CommandException{
         editDataset.getEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(allowRequest);
         
         if (fileNames != null) {
-            String successMessage = JH.localize("file.restricted.success");
+            String successMessage = BundleUtil.getStringFromBundle("file.restricted.success");
             successMessage = successMessage.replace("{0}", fileNames);
             JsfHelper.addFlashMessage(successMessage);
         }
@@ -524,7 +524,7 @@ public String save() {
         if (!constraintViolations.isEmpty()) {
              //JsfHelper.addFlashMessage(JH.localize("dataset.message.validationError"));
              fileDeleteInProgress = false;
-             JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("dataset.message.validationError"));
+             JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details."));
             return "";
         }
@@ -557,10 +557,10 @@ public String save() {
 
 
         if (fileDeleteInProgress) {
-            JsfHelper.addSuccessMessage(JH.localize("file.message.deleteSuccess"));
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.message.deleteSuccess"));
             fileDeleteInProgress = false;
         } else {
-            JsfHelper.addSuccessMessage(JH.localize("file.message.editSuccess"));
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.message.editSuccess"));
         }
         
         setVersion("DRAFT");
@@ -851,7 +851,7 @@ public List getExploreTools() {
     //Provenance fragment bean calls this to show error dialogs after popup failure
     //This can probably be replaced by calling JsfHelper from the provpopup bean
     public void showProvError() {
-        JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.metadataTab.provenance.error"));
+        JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.metadataTab.provenance.error"));
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java b/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java
index 3e064eaf50b..b0f1cd35ab3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileVersionDifference.java
@@ -5,6 +5,8 @@
  */
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -50,28 +52,28 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
         
         if (newFileMetadata.getDataFile() == null && originalFileMetadata != null){
             //File Deleted
-            updateDifferenceSummary("", ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileGroupTitle"),  0, 0, 1, 0);
+            updateDifferenceSummary("", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"),  0, 0, 1, 0);
             return;
         }
         
         if (this.originalFileMetadata == null && this.newFileMetadata.getDataFile() != null ){
             //File Added
-            updateDifferenceSummary( "", ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileGroupTitle"), 1, 0, 0, 0);
+            updateDifferenceSummary( "", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 1, 0, 0, 0);
         }
         
         //Check to see if File replaced
         if (originalFileMetadata != null &&
                  newFileMetadata.getDataFile() != null && originalFileMetadata.getDataFile() != null &&!this.originalFileMetadata.getDataFile().equals(this.newFileMetadata.getDataFile())){
-            updateDifferenceSummary( "", ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileGroupTitle"), 0, 0, 0, 1);
+            updateDifferenceSummary( "", BundleUtil.getStringFromBundle("file.versionDifferences.fileGroupTitle"), 0, 0, 0, 1);
         }
         
         if ( originalFileMetadata != null) {
             if (!newFileMetadata.getLabel().equals(originalFileMetadata.getLabel())) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileNameDetailTitle"), originalFileMetadata.getLabel(), newFileMetadata.getLabel()));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.fileNameDetailTitle"), originalFileMetadata.getLabel(), newFileMetadata.getLabel()));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileNameDetailTitle"), 0, 1, 0, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.fileNameDetailTitle"), 0, 1, 0, 0);
             }
         }
 
@@ -81,28 +83,28 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
                     && originalFileMetadata.getDescription() != null
                     && !newFileMetadata.getDescription().equals(originalFileMetadata.getDescription())) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.descriptionDetailTitle"), originalFileMetadata.getDescription(), newFileMetadata.getDescription()));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), originalFileMetadata.getDescription(), newFileMetadata.getDescription()));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.descriptionDetailTitle"), 0, 1, 0, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), 0, 1, 0, 0);
             }
             if (newFileMetadata.getDescription() != null
                     && originalFileMetadata.getDescription() == null
                     ) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.descriptionDetailTitle"), "", newFileMetadata.getDescription()));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), "", newFileMetadata.getDescription()));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.descriptionDetailTitle"), 1, 0, 0, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), 1, 0, 0, 0);
             }
             if (newFileMetadata.getDescription() == null
                     && originalFileMetadata.getDescription() != null
                     ) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.descriptionDetailTitle"), originalFileMetadata.getDescription(), "" ));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), originalFileMetadata.getDescription(), "" ));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.descriptionDetailTitle"), 0, 0, 1, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.descriptionDetailTitle"), 0, 0, 1, 0);
             }
         }  
         //Provenance Description differences
@@ -111,28 +113,28 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
                     && (originalFileMetadata.getProvFreeForm() != null && !originalFileMetadata.getProvFreeForm().isEmpty())
                     && !newFileMetadata.getProvFreeForm().equals(originalFileMetadata.getProvFreeForm())) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.provenanceDetailTitle"), originalFileMetadata.getProvFreeForm(), newFileMetadata.getProvFreeForm()));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), originalFileMetadata.getProvFreeForm(), newFileMetadata.getProvFreeForm()));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.provenanceDetailTitle"), 0, 1, 0, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), 0, 1, 0, 0);
             }
             if ((newFileMetadata.getProvFreeForm() != null && !newFileMetadata.getProvFreeForm().isEmpty())
                     && (originalFileMetadata.getProvFreeForm() == null || originalFileMetadata.getProvFreeForm().isEmpty())
                     ) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.provenanceDetailTitle"), "", newFileMetadata.getProvFreeForm()));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), "", newFileMetadata.getProvFreeForm()));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.provenanceDetailTitle"), 1, 0, 0, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), 1, 0, 0, 0);
             }
             if ((newFileMetadata.getProvFreeForm() == null || newFileMetadata.getProvFreeForm().isEmpty())
                     && (originalFileMetadata.getProvFreeForm() != null && !originalFileMetadata.getProvFreeForm().isEmpty())
                     ) {
                 if (details) {
-                    differenceDetailItems.add(new FileDifferenceDetailItem(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.provenanceDetailTitle"), originalFileMetadata.getProvFreeForm(), "" ));
+                    differenceDetailItems.add(new FileDifferenceDetailItem(BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), originalFileMetadata.getProvFreeForm(), "" ));
                 }
-                updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileMetadataGroupTitle"), 
-                        ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.provenanceDetailTitle"), 0, 0, 1, 0);
+                updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileMetadataGroupTitle"),
+                        BundleUtil.getStringFromBundle("file.versionDifferences.provenanceDetailTitle"), 0, 0, 1, 0);
             }
         }
         if (originalFileMetadata != null) {
@@ -177,10 +179,10 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
                     }
                 }
                 if (added > 0){
-                    updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileTagsGroupTitle"), "", added, 0, 0, 0, true);
+                    updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileTagsGroupTitle"), "", added, 0, 0, 0, true);
                 }
                 if (deleted > 0){
-                    updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileTagsGroupTitle"), "", 0, 0, deleted, 0, true);
+                    updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileTagsGroupTitle"), "", 0, 0, deleted, 0, true);
                 }
                 
             }
@@ -188,11 +190,11 @@ private void compareMetadata(FileMetadata newFileMetadata, FileMetadata original
             /*
             Get Restriction Differences
             */
-            value1 = originalFileMetadata.isRestricted() ? ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileRestricted") : ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileUnrestricted");
-            value2 = newFileMetadata.isRestricted() ? ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileRestricted") : ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileUnrestricted");
+            value1 = originalFileMetadata.isRestricted() ? BundleUtil.getStringFromBundle("file.versionDifferences.fileRestricted") : BundleUtil.getStringFromBundle("file.versionDifferences.fileUnrestricted");
+            value2 = newFileMetadata.isRestricted() ? BundleUtil.getStringFromBundle("file.versionDifferences.fileRestricted") : BundleUtil.getStringFromBundle("file.versionDifferences.fileUnrestricted");
             if (!value1.equals(value2)) {
                 if (!value1.equals(value2)) {
-                    updateDifferenceSummary(ResourceBundle.getBundle("Bundle").getString("file.versionDifferences.fileAccessTitle"), value2, 0, 0, 0, 0);
+                    updateDifferenceSummary(BundleUtil.getStringFromBundle("file.versionDifferences.fileAccessTitle"), value2, 0, 0, 0, 0);
                 }
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java
index e4d2a1346d3..b649831bf52 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java
@@ -78,6 +78,7 @@ class BeanDispatcher {
             switch ( doiProvider ) {
                 case "EZID": return ctxt.doiEZId();
                 case "DataCite": return ctxt.doiDataCite();
+                case "FAKE": return ctxt.fakePidProvider();
                 default: 
                     logger.log(Level.SEVERE, "Unknown doiProvider: {0}", doiProvider);
                     return null;
diff --git a/src/main/java/edu/harvard/iq/dataverse/Guestbook.java b/src/main/java/edu/harvard/iq/dataverse/Guestbook.java
index 70ef13c1023..742e73403c1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Guestbook.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Guestbook.java
@@ -21,6 +21,8 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
+
+import edu.harvard.iq.dataverse.util.DateUtil;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
@@ -145,7 +147,7 @@ public void setCreateTime(Date createTime) {
     }
 
     public String getCreateDate() {
-        return new SimpleDateFormat("MMMM d, yyyy").format(createTime);
+        return DateUtil.formatDate(createTime);
     }
         
     public Guestbook copyGuestbook(Guestbook source, Dataverse dataverse) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java
index a979a77eb07..a7fb2b5a3fd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookPage.java
@@ -161,7 +161,7 @@ public String init() {
             editMode = EditMode.CLONE;
             sourceGB = guestbookService.find(sourceId);
             guestbook = sourceGB.copyGuestbook(sourceGB, dataverse);
-            String name = "Copy of " + sourceGB.getName();
+            String name = BundleUtil.getStringFromBundle("page.copy") +" " + sourceGB.getName();
             guestbook.setName(name);
             guestbook.setUsageCount(new Long(0));
             guestbook.setCreateTime(new Timestamp(new Date().getTime()));
diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java
index ec0acde8a0c..23aac4a24a3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java
@@ -7,6 +7,8 @@
 
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.List;
 import java.util.logging.Logger;
@@ -91,8 +93,8 @@ public String init() {
         responsesAsArray = guestbookResponseService.findArrayByGuestbookIdAndDataverseId(guestbookId, dataverseId, systemConfig.getGuestbookResponsesPageDisplayLimit());
 
         FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO,
-                JH.localize("dataset.guestbooksResponses.tip.title"),
-                JH.localize("dataset.guestbooksResponses.tip.downloadascsv")));
+                BundleUtil.getStringFromBundle("dataset.guestbooksResponses.tip.title"),
+                BundleUtil.getStringFromBundle("dataset.guestbooksResponses.tip.downloadascsv")));
 
         return null;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java
index d947849f4fb..826cb2b37d5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java
@@ -124,7 +124,7 @@ public String init() {
         configuredHarvestingClients = harvestingClientService.getAllHarvestingClients();
         
         pageMode = PageMode.VIEW;
-        FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, JH.localize("harvestclients.title"), JH.localize("harvestclients.toptip")));
+        FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("harvestclients.title"), BundleUtil.getStringFromBundle("harvestclients.toptip")));
         return null; 
     }
     
@@ -216,7 +216,7 @@ public void runHarvest(HarvestingClient harvestingClient) {
             return;
         } 
                 
-        String successMessage = JH.localize("harvestclients.actions.runharvest.success");
+        String successMessage = BundleUtil.getStringFromBundle("harvestclients.actions.runharvest.success");
         successMessage = successMessage.replace("{0}", harvestingClient.getName());
         JsfHelper.addSuccessMessage(successMessage);
         
@@ -297,7 +297,7 @@ public void deleteClient() {
                 
                 //engineService.submit(new DeleteHarvestingClientCommand(dvRequestService.getDataverseRequest(), selectedClient));
                 harvestingClientService.deleteClient(selectedClient.getId());
-                JsfHelper.addInfoMessage(JH.localize("harvestclients.tab.header.action.delete.infomessage"));
+                JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("harvestclients.tab.header.action.delete.infomessage"));
                 
             //} catch (CommandException ex) {
             //    String failMessage = "Selected harvesting client cannot be deleted.";
@@ -365,7 +365,7 @@ public void createClient(ActionEvent ae) {
         // from the harvesting url:
         newHarvestingClient.setArchiveUrl(makeDefaultArchiveUrl());
         // set default description - they can customize it as they see fit:
-        newHarvestingClient.setArchiveDescription(JH.localize("harvestclients.viewEditDialog.archiveDescription.default.generic"));
+        newHarvestingClient.setArchiveDescription(BundleUtil.getStringFromBundle("harvestclients.viewEditDialog.archiveDescription.default.generic"));
         
         
         // will try to save it now:
@@ -378,7 +378,7 @@ public void createClient(ActionEvent ae) {
             // NO, we no longer create timers here. It is the job of the Mother Timer!
             //dataverseTimerService.createHarvestTimer(newHarvestingClient);
             
-            String successMessage = JH.localize("harvestclients.newClientDialog.success");
+            String successMessage = BundleUtil.getStringFromBundle("harvestclients.newClientDialog.success");
             successMessage = successMessage.replace("{0}", newHarvestingClient.getName());
             JsfHelper.addSuccessMessage(successMessage);
 
@@ -486,7 +486,7 @@ public void validateMetadataFormat(FacesContext context, UIComponent toValidate,
 
             input.setValid(false);
             context.addMessage(toValidate.getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.oaiMetadataFormat.required")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.oaiMetadataFormat.required")));
 
         }
     }
@@ -498,14 +498,14 @@ public boolean validateNickname() {
             if (getNewNickname().length() > 30 || (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", getNewNickname())) ) {
                 //input.setValid(false);
                 FacesContext.getCurrentInstance().addMessage(getNewClientNicknameInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.nickname.invalid")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.nickname.invalid")));
                 return false;
 
                 // If it passes the regex test, check 
             } else if ( harvestingClientService.findByNickname(getNewNickname()) != null ) {
                 //input.setValid(false);
                 FacesContext.getCurrentInstance().addMessage(getNewClientNicknameInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.nickname.alreadyused")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.nickname.alreadyused")));
                 return false;
             }
             return true;
@@ -513,14 +513,14 @@ public boolean validateNickname() {
         
         // Nickname field is empty:
         FacesContext.getCurrentInstance().addMessage(getNewClientNicknameInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.nickname.required")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.nickname.required")));
         return false;
     }
     
     public boolean validateSelectedDataverse() {
         if (selectedDestinationDataverse == null) {
             FacesContext.getCurrentInstance().addMessage(getSelectedDataverseMenu().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.dataverse.required")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.dataverse.required")));
             return false;
         }
         return true;
@@ -579,12 +579,12 @@ public boolean validateServerUrlOAI() {
             }
 
             FacesContext.getCurrentInstance().addMessage(getNewClientUrlInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + JH.localize("harvestclients.newClientDialog.url.invalid")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + BundleUtil.getStringFromBundle("harvestclients.newClientDialog.url.invalid")));
             return false;
 
         }
         FacesContext.getCurrentInstance().addMessage(getNewClientUrlInputField().getClientId(),
-                new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + JH.localize("harvestclients.newClientDialog.url.required")));
+                new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + BundleUtil.getStringFromBundle("harvestclients.newClientDialog.url.required")));
         return false;
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java
index ad68c750ec4..496050ca7f4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java
@@ -140,7 +140,7 @@ public String init() {
             oaiServerStatusRadio = oaiServerStatusRadioDisabled;
         }
                 
-        FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, JH.localize("harvestserver.title"), JH.localize("harvestserver.toptip")));
+        FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("harvestserver.title"), BundleUtil.getStringFromBundle("harvestserver.toptip")));
         return null; 
     }
     
@@ -173,7 +173,7 @@ public void toggleHarvestingServerStatus() {
             systemConfig.disableOAIServer();
         } else {
             systemConfig.enableOAIServer();
-            JsfHelper.addSuccessMessage(JH.localize("harvestserver.service.enable.success"));
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("harvestserver.service.enable.success"));
             checkIfDefaultSetExists();
         }
     }
@@ -253,7 +253,7 @@ public void createSet(ActionEvent ae) {
         try {
             oaiSetService.save(newOaiSet);
             configuredHarvestingSets = oaiSetService.findAll();  
-            String successMessage = JH.localize("harvestserver.newSetDialog.success");
+            String successMessage = BundleUtil.getStringFromBundle("harvestserver.newSetDialog.success");
             successMessage = successMessage.replace("{0}", newOaiSet.getSpec());
             JsfHelper.addSuccessMessage(successMessage);
             success = true;
@@ -326,7 +326,7 @@ public void deleteSet() {
                 selectedSet = null; 
 
                 configuredHarvestingSets = oaiSetService.findAll();
-                JsfHelper.addInfoMessage(JH.localize("harvestserver.tab.header.action.delete.infomessage"));
+                JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("harvestserver.tab.header.action.delete.infomessage"));
             } catch (Exception ex) {
                 String failMessage = BundleUtil.getStringFromBundle("harvest.delete.fail")+ex.getMessage();
                 JH.addMessage(FacesMessage.SEVERITY_FATAL, failMessage);
@@ -507,7 +507,7 @@ public void validateSetSpec() {
             if (! Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", getNewSetSpec()) ) {
                 //input.setValid(false);
                 FacesContext.getCurrentInstance().addMessage(getNewSetSpecInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.invalid")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.invalid")));
                 setSetSpecValidated(false);
                 return;
 
@@ -515,7 +515,7 @@ public void validateSetSpec() {
             } else if ( oaiSetService.findBySpec(getNewSetSpec()) != null ) {
                 //input.setValid(false);
                 FacesContext.getCurrentInstance().addMessage(getNewSetSpecInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.alreadyused")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.alreadyused")));
                 setSetSpecValidated(false);
                 return;
             }
@@ -525,7 +525,7 @@ public void validateSetSpec() {
         
         // Nickname field is empty:
         FacesContext.getCurrentInstance().addMessage(getNewSetSpecInputField().getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.required")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required")));
         setSetSpecValidated(false);
         return;
     }*/
@@ -541,21 +541,21 @@ public void validateSetSpec(FacesContext context, UIComponent toValidate, Object
                 if (value.length() > 30){
                     input.setValid(false);
                     context.addMessage(toValidate.getClientId(),
-                            new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.sizelimit")));
+                            new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.sizelimit")));
                     return;
                     
                 }
                 if (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", value)) {
                     input.setValid(false);
                     context.addMessage(toValidate.getClientId(),
-                            new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.invalid")));
+                            new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.invalid")));
                     return;
 
                     // If it passes the regex test, check 
                 } else if (oaiSetService.findBySpec(value) != null) {
                     input.setValid(false);
                     context.addMessage(toValidate.getClientId(),
-                            new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.alreadyused")));
+                            new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.alreadyused")));
                     return;
                 }
 
@@ -566,7 +566,7 @@ public void validateSetSpec(FacesContext context, UIComponent toValidate, Object
             // the field can't be left empty either: 
             input.setValid(false);
             context.addMessage(toValidate.getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.required")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required")));
 
         }
         
@@ -583,7 +583,7 @@ public void startSetExport(OAISet oaiSet) {
             return;
         } 
                 
-        String successMessage = JH.localize("harvestserver.actions.runreexport.success");
+        String successMessage = BundleUtil.getStringFromBundle("harvestserver.actions.runreexport.success");
         successMessage = successMessage.replace("{0}", oaiSet.getSpec());
         JsfHelper.addSuccessMessage(successMessage);
         configuredHarvestingSets = oaiSetService.findAll(); 
diff --git a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
index 2851bb7ccf3..f743c7c7c61 100644
--- a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
@@ -162,9 +162,9 @@ public String login() {
         }
         for ( FilledCredential fc : filledCredentialsList ) {
             if(fc.getValue()==null || fc.getValue().isEmpty()){
-                JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("login."+fc.getCredential().getTitle()));
+                JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("login."+fc.getCredential().getKey()));
             }
-            authReq.putCredential(fc.getCredential().getTitle(), fc.getValue());
+            authReq.putCredential(fc.getCredential().getKey(), fc.getValue());
         }
         authReq.setIpAddress( dvRequestService.getDataverseRequest().getSourceAddress() );
         try {
diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
index 16903fd5df7..8b8914dfa77 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -214,14 +214,19 @@ public Boolean sendNotificationEmail(UserNotification notification){
     }
     
     
-    public Boolean sendNotificationEmail(UserNotification notification, String comment){  
+    public Boolean sendNotificationEmail(UserNotification notification, String comment) {
+        return sendNotificationEmail(notification, comment, null);
+    }
+    
+    
+    public Boolean sendNotificationEmail(UserNotification notification, String comment, AuthenticatedUser requestor){  
 
         boolean retval = false;
         String emailAddress = getUserEmailAddress(notification);
         if (emailAddress != null){
            Object objectOfNotification =  getObjectOfNotification(notification);
            if (objectOfNotification != null){
-               String messageText = getMessageTextBasedOnNotification(notification, objectOfNotification);
+               String messageText = getMessageTextBasedOnNotification(notification, objectOfNotification, comment, requestor);
                String rootDataverseName = dataverseService.findRootDataverse().getName();
                String subjectText = MailUtil.getSubjectTextBasedOnNotification(notification, rootDataverseName, objectOfNotification);
                if (!(messageText.isEmpty() || subjectText.isEmpty())){
@@ -318,9 +323,14 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
             
     }
     
-    public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject, String comment){       
+    public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject, String comment) {
+        return getMessageTextBasedOnNotification(userNotification, targetObject, comment, null);
+
+    }
+
+    public String getMessageTextBasedOnNotification(UserNotification userNotification, Object targetObject, String comment, AuthenticatedUser requestor) {      
         
-        String messageText = ResourceBundle.getBundle("Bundle").getString("notification.email.greeting");
+        String messageText = BundleUtil.getStringFromBundle("notification.email.greeting");
         DatasetVersion version;
         Dataset dataset;
         DvObject dvObj;
@@ -338,17 +348,17 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 dvObjURL = getDvObjectLink(dvObj);
                 dvObjTypeStr = getDvObjectTypeString(dvObj);
 
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.assignRole");
+                pattern = BundleUtil.getStringFromBundle("notification.email.assignRole");
                 String[] paramArrayAssignRole = {joinedRoleNames, dvObjTypeStr, dvObj.getDisplayName(), dvObjURL};
                 messageText += MessageFormat.format(pattern, paramArrayAssignRole);
                 if (joinedRoleNames.contains("File Downloader")){
                     if (dvObjTypeStr.equals("dataset")){
-                         pattern = ResourceBundle.getBundle("Bundle").getString("notification.access.granted.fileDownloader.additionalDataset");
+                         pattern = BundleUtil.getStringFromBundle("notification.access.granted.fileDownloader.additionalDataset");
                          String[]  paramArrayAssignRoleDS = {" "};
                         messageText += MessageFormat.format(pattern, paramArrayAssignRoleDS);
                     }
                     if (dvObjTypeStr.equals("dataverse")){
-                        pattern = ResourceBundle.getBundle("Bundle").getString("notification.access.granted.fileDownloader.additionalDataverse");
+                        pattern = BundleUtil.getStringFromBundle("notification.access.granted.fileDownloader.additionalDataverse");
                          String[]  paramArrayAssignRoleDV = {" "};
                         messageText += MessageFormat.format(pattern, paramArrayAssignRoleDV);
                     }                   
@@ -360,7 +370,7 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 dvObjURL = getDvObjectLink(dvObj);
                 dvObjTypeStr = getDvObjectTypeString(dvObj);
 
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.revokeRole");
+                pattern = BundleUtil.getStringFromBundle("notification.email.revokeRole");
                 String[] paramArrayRevokeRole = {dvObjTypeStr, dvObj.getDisplayName(), dvObjURL};
                 messageText += MessageFormat.format(pattern, paramArrayRevokeRole);
                 return messageText;
@@ -385,19 +395,21 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 return messageText += dataverseCreatedMessage;
             case REQUESTFILEACCESS:
                 DataFile datafile = (DataFile) targetObject;
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.requestFileAccess");
-                String[] paramArrayRequestFileAccess = {datafile.getOwner().getDisplayName(), getDatasetManageFileAccessLink(datafile)};
+                pattern = BundleUtil.getStringFromBundle("notification.email.requestFileAccess");
+                String requestorName = (requestor.getLastName() != null && requestor.getLastName() != null) ? requestor.getFirstName() + " " + requestor.getLastName() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");
+                String requestorEmail = requestor.getEmail() != null ? requestor.getEmail() : BundleUtil.getStringFromBundle("notification.email.info.unavailable"); 
+                String[] paramArrayRequestFileAccess = {datafile.getOwner().getDisplayName(), requestorName, requestorEmail, getDatasetManageFileAccessLink(datafile)};
                 messageText += MessageFormat.format(pattern, paramArrayRequestFileAccess);
                 return messageText;
             case GRANTFILEACCESS:
                 dataset = (Dataset) targetObject;
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.grantFileAccess");
+                pattern = BundleUtil.getStringFromBundle("notification.email.grantFileAccess");
                 String[] paramArrayGrantFileAccess = {dataset.getDisplayName(), getDatasetLink(dataset)};
                 messageText += MessageFormat.format(pattern, paramArrayGrantFileAccess);
                 return messageText;
             case REJECTFILEACCESS:
                 dataset = (Dataset) targetObject;
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.rejectFileAccess");
+                pattern = BundleUtil.getStringFromBundle("notification.email.rejectFileAccess");
                 String[] paramArrayRejectFileAccess = {dataset.getDisplayName(), getDatasetLink(dataset)};
                 messageText += MessageFormat.format(pattern, paramArrayRejectFileAccess);
                 return messageText;
@@ -415,14 +427,14 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 return messageText += datasetCreatedMessage;
             case MAPLAYERUPDATED:
                 version =  (DatasetVersion) targetObject;
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.worldMap.added");
+                pattern = BundleUtil.getStringFromBundle("notification.email.worldMap.added");
                 String[] paramArrayMapLayer = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset())};
                 messageText += MessageFormat.format(pattern, paramArrayMapLayer);
                 return messageText;
             case MAPLAYERDELETEFAILED:
                 FileMetadata targetFileMetadata = (FileMetadata) targetObject;
                 version =  targetFileMetadata.getDatasetVersion();
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.maplayer.deletefailed.text");
+                pattern = BundleUtil.getStringFromBundle("notification.email.maplayer.deletefailed.text");
                 String[] paramArrayMapLayerDelete = {targetFileMetadata.getLabel(), getDatasetLink(version.getDataset())};
                 messageText += MessageFormat.format(pattern, paramArrayMapLayerDelete);
                 return messageText;                   
@@ -437,22 +449,26 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 if (comment != null && !comment.isEmpty()) {
                     mightHaveSubmissionComment = ".\n\n" + BundleUtil.getStringFromBundle("submissionComment") + "\n\n" + comment;
                 }
-                */
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.wasSubmittedForReview");
+                */                
+                 requestorName = (requestor.getLastName() != null && requestor.getLastName() != null) ? requestor.getFirstName() + " " + requestor.getLastName() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");
+                 requestorEmail = requestor.getEmail() != null ? requestor.getEmail() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");               
+                pattern = BundleUtil.getStringFromBundle("notification.email.wasSubmittedForReview");
+
                 String[] paramArraySubmittedDataset = {version.getDataset().getDisplayName(), getDatasetDraftLink(version.getDataset()), 
-                    version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner()), mightHaveSubmissionComment};
+                    version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner()),
+                   requestorName, requestorEmail  };
                 messageText += MessageFormat.format(pattern, paramArraySubmittedDataset);
                 return messageText;
             case PUBLISHEDDS:
                 version =  (DatasetVersion) targetObject;
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.wasPublished");
+                pattern = BundleUtil.getStringFromBundle("notification.email.wasPublished");
                 String[] paramArrayPublishedDataset = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset()), 
                     version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner())};
                 messageText += MessageFormat.format(pattern, paramArrayPublishedDataset);
                 return messageText;
             case RETURNEDDS:
                 version =  (DatasetVersion) targetObject;
-                pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.wasReturnedByReviewer");
+                pattern = BundleUtil.getStringFromBundle("notification.email.wasReturnedByReviewer");
                 
                 String optionalReturnReason = "";
                 /*
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
index bef3d174088..5257988de4e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
@@ -58,7 +58,7 @@ public class ManageGroupsPage implements java.io.Serializable {
     GroupServiceBean groupService;
     @Inject
     DataverseRequestServiceBean dvRequestService;
-    
+
     @Inject
     PermissionsWrapper permissionsWrapper;
 
@@ -83,17 +83,17 @@ public String init() {
         setDataverse(dataverseService.find(getDataverseId()));
         Dataverse editDv = getDataverse();
         dvpage.setDataverse(editDv);
-        
+
         if (editDv == null) {
             return permissionsWrapper.notFound();
         }
-        
+
         Boolean hasPermissions = permissionsWrapper.canIssueCommand(editDv, CreateExplicitGroupCommand.class);
         hasPermissions |= permissionsWrapper.canIssueCommand(editDv, DeleteExplicitGroupCommand.class);
         hasPermissions |= permissionsWrapper.canIssueCommand(editDv, UpdateExplicitGroupCommand.class);
         if (!hasPermissions) {
             return permissionsWrapper.notAuthorized();
-        } 
+        }
         explicitGroups = new LinkedList<>(explicitGroupService.findByOwner(getDataverseId()));
 
         return null;
@@ -182,7 +182,7 @@ public void viewSelectedGroup(ExplicitGroup selectedGroup) {
      * @return The set of role assignees belonging to explicit group.
      */
     public List getExplicitGroupMembers(ExplicitGroup eg) {
-        return (eg != null) ? 
+        return (eg != null) ?
                 new ArrayList<>(eg.getDirectMembers()) : null;
     }
 
@@ -194,11 +194,11 @@ public List getExplicitGroupMembers(ExplicitGroup eg) {
      */
     public String getRoleAssigneeTypeString(RoleAssignee ra) {
         if (ra instanceof User) {
-            return "User";
+            return BundleUtil.getStringFromBundle("dataverse.manageGroups.User");
         } else if (ra instanceof Group) {
-            return "Group";
+            return BundleUtil.getStringFromBundle("dataverse.manageGroups.Group");
         } else {
-            return "unknown";
+            return BundleUtil.getStringFromBundle("dataverse.manageGroups.unknown");
         }
     }
 
@@ -214,20 +214,20 @@ public String getMembershipString(ExplicitGroup eg) {
         }
 
         if (userCount == 0 && groupCount == 0) {
-            return "No members";
+            return BundleUtil.getStringFromBundle("dataverse.manageGroups.nomembers");
         }
-        
+
         String memberString = "";
         if (userCount == 1) {
-            memberString = "1 user";
+            memberString = "1 "+BundleUtil.getStringFromBundle("dataverse.manageGroups.user");
         } else if (userCount != 1) {
-            memberString = Long.toString(userCount) + " users";
+            memberString = Long.toString(userCount) + " "+BundleUtil.getStringFromBundle("dataverse.manageGroups.users");
         }
 
         if (groupCount == 1) {
-            memberString = memberString + ", 1 group";
+            memberString = memberString + ", 1 " + BundleUtil.getStringFromBundle("dataverse.manageGroups.group");
         } else if (groupCount != 1) {
-            memberString = memberString + ", " + Long.toString(groupCount) + " groups";
+            memberString = memberString + ", " + Long.toString(groupCount) + " " + BundleUtil.getStringFromBundle("dataverse.manageGroups.groups");
         }
 
         return memberString;
@@ -238,9 +238,9 @@ public void removeMemberFromSelectedGroup(RoleAssignee ra) {
     }
 
     public List completeRoleAssignee( String query ) {
-        
+
         List alreadyAssignedRoleAssignees = new ArrayList<>();
-        
+
         if (this.getNewExplicitGroupRoleAssignees() != null) {
             alreadyAssignedRoleAssignees.addAll(this.getNewExplicitGroupRoleAssignees());
         }
@@ -249,10 +249,10 @@ public List completeRoleAssignee( String query ) {
         }
         if (this.getSelectedGroupAddRoleAssignees() != null) {
             alreadyAssignedRoleAssignees.addAll(this.getSelectedGroupAddRoleAssignees());
-        }        
-        
-        return roleAssigneeService.filterRoleAssignees(query, dataverse, alreadyAssignedRoleAssignees);         
-        
+        }
+
+        return roleAssigneeService.filterRoleAssignees(query, dataverse, alreadyAssignedRoleAssignees);
+
     }
 
     /*
@@ -293,7 +293,7 @@ public void createExplicitGroup(ActionEvent ae) {
             } catch ( GroupException ge ) {
                 JsfHelper.JH.addMessage(FacesMessage.SEVERITY_ERROR,
                         BundleUtil.getStringFromBundle("dataverse.manageGroups.create.fail"),
-                                        ge.getMessage());
+                        ge.getMessage());
                 return;
             }
         }
@@ -306,16 +306,16 @@ public void createExplicitGroup(ActionEvent ae) {
         } catch ( CreateExplicitGroupCommand.GroupAliasExistsException gaee ) {
             explicitGroupIdentifierField.setValid( false );
             FacesContext.getCurrentInstance().addMessage(explicitGroupIdentifierField.getClientId(),
-                           new FacesMessage( FacesMessage.SEVERITY_ERROR, gaee.getMessage(), null));
+                    new FacesMessage( FacesMessage.SEVERITY_ERROR, gaee.getMessage(), null));
 
         } catch (CommandException ex) {
             logger.log(Level.WARNING, "Group creation failed", ex);
             JsfHelper.JH.addMessage(FacesMessage.SEVERITY_ERROR,
                     BundleUtil.getStringFromBundle("dataverse.manageGroups.create.fail"),
-                                    ex.getMessage());
+                    ex.getMessage());
         } catch (Exception ex) {
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("permission.roleNotSaved"));
-             logger.log(Level.SEVERE, "Error saving role: " + ex.getMessage(), ex);
+            logger.log(Level.SEVERE, "Error saving role: " + ex.getMessage(), ex);
         }
         showAssignmentMessages();
     }
@@ -331,7 +331,7 @@ public void saveExplicitGroup(ActionEvent ae) {
             } catch ( GroupException ge ) {
                 JsfHelper.JH.addMessage(FacesMessage.SEVERITY_ERROR,
                         BundleUtil.getStringFromBundle("dataverse.manageGroups.edit.fail"),
-                                        ge.getMessage());
+                        ge.getMessage());
                 return;
             }
         }
@@ -343,10 +343,10 @@ public void saveExplicitGroup(ActionEvent ae) {
 
         } catch (CommandException ex) {
             JsfHelper.JH.addMessage(FacesMessage.SEVERITY_ERROR,BundleUtil.getStringFromBundle("dataverse.manageGroups.save.fail"),
-                                    ex.getMessage());
+                    ex.getMessage());
         } catch (Exception ex) {
             JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("permission.roleNotSaved"));
-             logger.log(Level.SEVERE, "Error saving role: " + ex.getMessage(), ex);
+            logger.log(Level.SEVERE, "Error saving role: " + ex.getMessage(), ex);
         }
         showAssignmentMessages();
     }
@@ -387,13 +387,13 @@ public void validateGroupIdentifier(FacesContext context, UIComponent toValidate
             if (! Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", value) ) {
                 input.setValid(false);
                 context.addMessage(toValidate.getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.invalid")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.invalid")));
 
             } else if ( explicitGroupService.findInOwner(dataverse.getId(), value) != null ) {
                 // Ok, see that the alias is not taken
                 input.setValid(false);
                 context.addMessage(toValidate.getClientId(),
-                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.taken")));
+                    new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.taken")));
             }
         }
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java
index 564cddcbfe3..a4602759ea8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java
@@ -84,8 +84,8 @@ public String init() {
             displayDownloadAll = true;
             FacesContext.getCurrentInstance().addMessage(null, 
                     new FacesMessage(FacesMessage.SEVERITY_INFO, 
-                            JH.localize("dataset.manageGuestbooks.tip.title"), 
-                            JH.localize("dataset.manageGuestbooks.tip.downloadascsv")));
+                            BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.title"), 
+                            BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.downloadascsv")));
 
         }
 
@@ -263,9 +263,9 @@ private void saveDataverse(String successMessage, String failureMessage) {
         }
         try {
             engineService.submit(new UpdateDataverseCommand(getDataverse(), null, null, dvRequestService.getDataverseRequest(), null));
-            JsfHelper.addSuccessMessage(JH.localize(successMessage));
+            JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle(successMessage));
         } catch (CommandException ex) {
-            JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize(failureMessage));
+            JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle(failureMessage));
         }
 
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
index 5ad4afc4d75..646f1275616 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
@@ -1,3 +1,4 @@
+
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
@@ -64,7 +65,7 @@ public class ManagePermissionsPage implements java.io.Serializable {
     AuthenticationServiceBean authenticationService;
     @EJB
     ExplicitGroupServiceBean explicitGroupService;
-    @EJB 
+    @EJB
     GroupServiceBean groupService;
     @EJB
     EjbDataverseEngine commandEngine;
@@ -81,12 +82,12 @@ public class ManagePermissionsPage implements java.io.Serializable {
 
     @Inject
     DataverseSession session;
-    
+
     private DataverseRolePermissionHelper dataverseRolePermissionHelper;
-        private List roleList;
+    private List roleList;
 
     DvObject dvObject = new Dataverse(); // by default we use a Dataverse, but this will be overridden in init by the findById
-    
+
     public DvObject getDvObject() {
         return dvObject;
     }
@@ -96,7 +97,7 @@ public void setDvObject(DvObject dvObject) {
         /*
         SEK 09/15/2016 - may need to do something here if permissions are transmitted/inherited from dataverse to dataverse
         */
-        
+
         /*if (dvObject instanceof DvObjectContainer) {
          inheritAssignments = !((DvObjectContainer) dvObject).isPermissionRoot();
          }*/
@@ -125,14 +126,14 @@ public String init() {
         }
         roleList = roleService.findAll();
         roleAssignments = initRoleAssignments();
-        dataverseRolePermissionHelper = new DataverseRolePermissionHelper(roleList);  
+        dataverseRolePermissionHelper = new DataverseRolePermissionHelper(roleList);
         return "";
     }
 
-    /* 
+    /*
      main page - role assignment table
      */
-    
+
     // used by remove Role Assignment
     private RoleAssignment selectedRoleAssignment;
 
@@ -142,8 +143,8 @@ public RoleAssignment getSelectedRoleAssignment() {
 
     public void setSelectedRoleAssignment(RoleAssignment selectedRoleAssignment) {
         this.selectedRoleAssignment = selectedRoleAssignment;
-    }   
-    
+    }
+
     private List roleAssignments;
 
     public List getRoleAssignments() {
@@ -153,7 +154,7 @@ public List getRoleAssignments() {
     public void setRoleAssignments(List roleAssignments) {
         this.roleAssignments = roleAssignments;
     }
-  
+
     public List initRoleAssignments() {
         List raList = null;
         if (dvObject != null && dvObject.getId() != null) {
@@ -173,17 +174,17 @@ public List initRoleAssignments() {
         }
         return raList;
     }
-      
+
     public void removeRoleAssignment() {
         revokeRole(selectedRoleAssignment);
 
         if (dvObject instanceof Dataverse) {
             initAccessSettings(); // in case the revoke was for the AuthenticatedUsers group
-        }        
+        }
         roleAssignments = initRoleAssignments();
-        showAssignmentMessages();        
+        showAssignmentMessages();
     }
-    
+
     // internal method used by removeRoleAssignment and saveConfiguration
     private void revokeRole(RoleAssignment ra) {
         try {
@@ -198,10 +199,10 @@ private void revokeRole(RoleAssignment ra) {
             logger.log(Level.SEVERE, "Error removing role assignment: " + ex.getMessage(), ex);
         }
     }
-    
-    /* 
+
+    /*
      main page - roles table
-     */    
+     */
 
     public List getRoles() {
         if (dvObject != null && dvObject.getId() != null) {
@@ -227,13 +228,13 @@ public void cloneRole(String roleId) {
     public void editRole(String roleId) {
         setRole(roleService.find(Long.parseLong(roleId)));
     }
-    
+
     /*
     ============================================================================
      edit configuration dialog // only for dataverse version of page
     ============================================================================
      */
-    
+
     private String authenticatedUsersContributorRoleAlias = null;
     private String defaultContributorRoleAlias = DataverseRole.EDITOR;
 
@@ -248,13 +249,56 @@ public void setAuthenticatedUsersContributorRoleAlias(String authenticatedUsersC
     public String getDefaultContributorRoleAlias() {
         return defaultContributorRoleAlias;
     }
+    
+    public Boolean isCustomDefaultContributorRole(){
+        if (defaultContributorRoleAlias == null){
+            initAccessSettings();
+        }
+        return !( defaultContributorRoleAlias.equals(DataverseRole.EDITOR) || defaultContributorRoleAlias.equals(DataverseRole.CURATOR));
+    }
+    
+    public String getCustomDefaultContributorRoleName(){
+        if (dvObject instanceof Dataverse && isCustomDefaultContributorRole() ){           
+            return defaultContributorRoleAlias.equals(DataverseRole.NONE) ? BundleUtil.getStringFromBundle("permission.default.contributor.role.none.name") : roleService.findCustomRoleByAliasAndOwner(defaultContributorRoleAlias,dvObject.getId()).getName();
+        } else {
+            return "";
+        }
+    }
+    
+    public String getCustomDefaultContributorRoleAlias(){
+        if (dvObject instanceof Dataverse && isCustomDefaultContributorRole()){
+            return defaultContributorRoleAlias.equals(DataverseRole.NONE) ? DataverseRole.NONE : roleService.findCustomRoleByAliasAndOwner(defaultContributorRoleAlias,dvObject.getId()).getAlias();
+        } else {
+            return "";
+        }
+    }
+    
+    public void  setCustomDefaultContributorRoleAlias(String dummy){
+        //dummy method for interface
+    }
+    
+    public void  setCustomDefaultContributorRoleName(String dummy){
+        //dummy method for interface
+    }
+    
+    public String getCustomDefaultContributorRoleDescription(){
+        if (dvObject instanceof Dataverse  && isCustomDefaultContributorRole()){
+            return defaultContributorRoleAlias.equals(DataverseRole.NONE) ? BundleUtil.getStringFromBundle("permission.default.contributor.role.none.decription" ) :roleService.findCustomRoleByAliasAndOwner(defaultContributorRoleAlias,dvObject.getId() ).getDescription();
+        } else {
+            return "";
+        }
+    }
+    
+    public void  setCustomDefaultContributorRoleDescription(String dummy){
+        //dummy method for interface
+    }
 
     public void setDefaultContributorRoleAlias(String defaultContributorRoleAlias) {
         this.defaultContributorRoleAlias = defaultContributorRoleAlias;
-    }    
-    
-   public void initAccessSettings() {
-       if (dvObject instanceof Dataverse) {
+    }
+
+    public void initAccessSettings() {
+        if (dvObject instanceof Dataverse) {
             authenticatedUsersContributorRoleAlias = "";
 
             List aUsersRoleAssignments = roleService.directRoleAssignments(AuthenticatedUsers.get(), dvObject);
@@ -264,13 +308,13 @@ public void initAccessSettings() {
                 break;
                 // @todo handle case where more than one role has been assigned to the AutenticatedUsers group!
             }
-
-            defaultContributorRoleAlias = ((Dataverse) dvObject).getDefaultContributorRole().getAlias();   
-       }
+           
+            defaultContributorRoleAlias = ((Dataverse) dvObject).getDefaultContributorRole() == null ? DataverseRole.NONE : ((Dataverse) dvObject).getDefaultContributorRole().getAlias();
+        }
     }
-   
-    
-   public void saveConfiguration(ActionEvent e) {
+
+
+    public void saveConfiguration(ActionEvent e) {
         // Set role (if any) for authenticatedUsers
         DataverseRole roleToAssign = null;
         List contributorRoles = Arrays.asList(DataverseRole.FULL_CONTRIBUTOR, DataverseRole.DV_CONTRIBUTOR, DataverseRole.DS_CONTRIBUTOR);
@@ -306,7 +350,7 @@ public void saveConfiguration(ActionEvent e) {
                     JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.defaultPermissionDataverseUpdated"));
                 } catch (PermissionException ex) {
                     JH.addMessage(FacesMessage.SEVERITY_ERROR,  BundleUtil.getStringFromBundle("permission.CannotAssigntDefaultPermissions"),
-                             BundleUtil.getStringFromBundle("permission.permissionsMissing" , Arrays.asList(ex.getRequiredPermissions().toString())));
+                            BundleUtil.getStringFromBundle("permission.permissionsMissing" , Arrays.asList(ex.getRequiredPermissions().toString())));
 
                 } catch (CommandException ex) {
                     JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("permission.CannotAssigntDefaultPermissions"));
@@ -316,7 +360,7 @@ public void saveConfiguration(ActionEvent e) {
         }
         roleAssignments = initRoleAssignments();
         showConfigureMessages();
-    }    
+    }
 
     /*
    ============================================================================
@@ -347,18 +391,18 @@ public void initAssigneeDialog(ActionEvent ae) {
         selectedRoleId = null;
         showNoMessages();
     }
-                
+
     public List completeRoleAssignee( String query ) {
-        return roleAssigneeService.filterRoleAssignees(query, dvObject, roleAssignSelectedRoleAssignees);                  
+        return roleAssigneeService.filterRoleAssignees(query, dvObject, roleAssignSelectedRoleAssignees);
     }
-    
+
     public List getAvailableRoles() {
         List roles = new LinkedList<>();
         if (dvObject != null && dvObject.getId() != null) {
 
             if (dvObject instanceof Dataverse) {
                 roles.addAll(roleService.availableRoles(dvObject.getId()));
-                
+
             } else if (dvObject instanceof Dataset) {
                 // don't show roles that only have Dataverse level permissions
                 // current the available roles for a dataset are gotten from its parent
@@ -370,11 +414,11 @@ public List getAvailableRoles() {
                         }
                     }
                 }
-                
+
             } else if (dvObject instanceof DataFile) {
                 roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER));
             }
-            
+
             Collections.sort(roles, DataverseRole.CMP_BY_NAME);
         }
         return roles;
@@ -386,49 +430,49 @@ public DataverseRole getAssignedRole() {
         }
         return null;
     }
-    
+
     public String getAssignedRoleObjectTypes(){
         String retString = "";
         if (selectedRoleId != null) {
-            /* SEK 09/15/2016 SEK commenting out for now 
+            /* SEK 09/15/2016 SEK commenting out for now
                 because permissions are not inherited
-            
+
             if (dataverseRolePermissionHelper.hasDataversePermissions(selectedRoleId) && dvObject instanceof Dataverse){
-                String dvLabel = ResourceBundle.getBundle("Bundle").getString("dataverses");
+                String dvLabel = BundleUtil.getStringFromBundle("dataverses");
                 retString = dvLabel;
             }
             */
             if (dataverseRolePermissionHelper.hasDatasetPermissions(selectedRoleId) && dvObject instanceof Dataverse){
-                String dsLabel = ResourceBundle.getBundle("Bundle").getString("datasets");
+                String dsLabel = BundleUtil.getStringFromBundle("datasets");
                 if(!retString.isEmpty()) {
                     retString +=", " +  dsLabel;
                 } else {
-                   retString = dsLabel; 
+                    retString = dsLabel;
                 }
-                
+
             }
             if (dataverseRolePermissionHelper.hasFilePermissions(selectedRoleId)){
-                String filesLabel = ResourceBundle.getBundle("Bundle").getString("files");
+                String filesLabel = BundleUtil.getStringFromBundle("files");
                 if(!retString.isEmpty()) {
                     retString +=", " + filesLabel;
                 } else {
-                   retString = filesLabel; 
-                }                
+                    retString = filesLabel;
+                }
             }
             return retString;
         }
-        return null;        
+        return null;
     }
-    
+
     public String getDefinitionLevelString(){
         if (dvObject != null){
-            if (dvObject instanceof Dataverse) return ResourceBundle.getBundle("Bundle").getString("dataverse");
-            if (dvObject instanceof Dataset) return ResourceBundle.getBundle("Bundle").getString("dataset");
+            if (dvObject instanceof Dataverse) return BundleUtil.getStringFromBundle("dataverse");
+            if (dvObject instanceof Dataset) return BundleUtil.getStringFromBundle("dataset");
         }
         return null;
     }
 
-    public void assignRole(ActionEvent evt) {        
+    public void assignRole(ActionEvent evt) {
         logger.info("Got to assignRole");
         List selectedRoleAssigneesList = getRoleAssignSelectedRoleAssignees();
         if ( selectedRoleAssigneesList == null ) {
@@ -438,7 +482,7 @@ public void assignRole(ActionEvent evt) {
         for (RoleAssignee roleAssignee : selectedRoleAssigneesList) {
             assignRole(roleAssignee, roleService.find(selectedRoleId));
         }
-        roleAssignments = initRoleAssignments();  
+        roleAssignments = initRoleAssignments();
     }
 
     /**
@@ -449,7 +493,7 @@ public void assignRole(ActionEvent evt) {
      */
     private void notifyRoleChange(RoleAssignee ra, UserNotification.Type type) {
         if (ra instanceof AuthenticatedUser) {
-                userNotificationService.sendNotification((AuthenticatedUser) ra, new Timestamp(new Date().getTime()), type, dvObject.getId());
+            userNotificationService.sendNotification((AuthenticatedUser) ra, new Timestamp(new Date().getTime()), type, dvObject.getId());
         } else if (ra instanceof ExplicitGroup) {
             ExplicitGroup eg = (ExplicitGroup) ra;
             Set explicitGroupMembers = eg.getContainedRoleAssgineeIdentifiers();
@@ -474,7 +518,7 @@ private void assignRole(RoleAssignee ra, DataverseRole r) {
             JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.roleAssignedToFor", args));
             // don't notify if role = file downloader and object is not released
             if (!(r.getAlias().equals(DataverseRole.FILE_DOWNLOADER) && !dvObject.isReleased()) ){
-                            notifyRoleChange(ra, UserNotification.Type.ASSIGNROLE);
+                notifyRoleChange(ra, UserNotification.Type.ASSIGNROLE);
             }
 
         } catch (PermissionException ex) {
@@ -490,7 +534,7 @@ private void assignRole(RoleAssignee ra, DataverseRole r) {
             //JH.addMessage(FacesMessage.SEVERITY_FATAL, "The role was not able to be assigned.");
             logger.log(Level.SEVERE, "Error assiging role: " + ex.getMessage(), ex);
         }
-  
+
         showAssignmentMessages();
     }
 
@@ -549,8 +593,8 @@ public void updateRole(ActionEvent e) {
         }
         showRoleMessages();
     }
-    
-    
+
+
     public DataverseRolePermissionHelper getDataverseRolePermissionHelper() {
         return dataverseRolePermissionHelper;
     }
@@ -559,39 +603,39 @@ public void setDataverseRolePermissionHelper(DataverseRolePermissionHelper datav
         this.dataverseRolePermissionHelper = dataverseRolePermissionHelper;
     }
 
-    /* 
+    /*
     ============================================================================
     Internal methods
     ============================================================================
     */
-    
+
     boolean renderConfigureMessages = false;
     boolean renderAssignmentMessages = false;
-    boolean renderRoleMessages = false;    
-    
+    boolean renderRoleMessages = false;
+
     private void showNoMessages() {
         renderConfigureMessages = false;
         renderAssignmentMessages = false;
         renderRoleMessages = false;
-    }    
-    
+    }
+
     private void showConfigureMessages() {
         renderConfigureMessages = true;
         renderAssignmentMessages = false;
         renderRoleMessages = false;
     }
-    
+
     private void showAssignmentMessages() {
         renderConfigureMessages = false;
         renderAssignmentMessages = true;
         renderRoleMessages = false;
     }
-    
+
     private void showRoleMessages() {
         renderConfigureMessages = false;
         renderAssignmentMessages = false;
         renderRoleMessages = true;
-    }    
+    }
 
     public Boolean getRenderConfigureMessages() {
         return renderConfigureMessages;
@@ -627,10 +671,10 @@ public RoleAssignmentRow(RoleAssignment anRa, RoleAssigneeDisplayInfo disInf) {
             ra = anRa;
             assigneeDisplayInfo = disInf;
         }
-        
+
         public RoleAssignment getRoleAssignment() {
             return ra;
-        }        
+        }
 
         public RoleAssigneeDisplayInfo getAssigneeDisplayInfo() {
             return assigneeDisplayInfo;
@@ -643,7 +687,7 @@ public DataverseRole getRole() {
         public String getRoleName() {
             return getRole().getName();
         }
-                
+
 
         public DvObject getDefinitionPoint() {
             return ra.getDefinitionPoint();
diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
index 781f7c0eaba..f4ece9cab6b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
@@ -93,7 +93,7 @@ public String init() {
             templates.add(ct);
         }
         if (!templates.isEmpty()){
-             JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.manageTemplates.info.message.notEmptyTable"));
+             JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.manageTemplates.info.message.notEmptyTable"));
         }
         return null;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java b/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java
index fdfef941dfe..1a1a87b1b87 100644
--- a/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java
+++ b/src/main/java/edu/harvard/iq/dataverse/MetadataBlock.java
@@ -1,7 +1,10 @@
 package edu.harvard.iq.dataverse;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.io.Serializable;
 import java.util.List;
+import java.util.MissingResourceException;
 import java.util.Objects;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -43,6 +46,9 @@ public class MetadataBlock implements Serializable {
     @Column( nullable = false )
     private String displayName;
 
+    @Column( name = "namespaceuri", columnDefinition = "TEXT")
+    private String namespaceUri;
+    
     public Long getId() {
         return id;
     }
@@ -56,7 +62,14 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
-    
+
+    public String getNamespaceUri() {
+        return namespaceUri;
+    }
+    public void setNamespaceUri(String namespaceUri) {
+        this.namespaceUri = namespaceUri;
+    }
+
     @OneToMany(mappedBy = "metadataBlock", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     @OrderBy("displayOrder")
     private List datasetFieldTypes;
@@ -168,6 +181,14 @@ public boolean equals(Object object) {
     @Override
     public String toString() {
         return "edu.harvard.iq.dataverse.MetadataBlock[ id=" + id + " ]";
-    }    
-    
+    }
+
+    public String getLocaleDisplayName()
+    {
+        try {
+            return BundleUtil.getStringFromPropertyFile("metadatablock.displayName", getName());
+        } catch (MissingResourceException e) {
+            return displayName;
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/Metric.java b/src/main/java/edu/harvard/iq/dataverse/Metric.java
index 7bbfb799c3d..ebcde546002 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Metric.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Metric.java
@@ -51,9 +51,9 @@ public class Metric implements Serializable {
     public Metric() {
     }
 
-    //For monthly metrics
-    public Metric(String metricTitle, String yyyymm, String metricValue) {
-        this.metricName = generateMetricName(metricTitle, yyyymm);
+    //For monthly and day metrics
+    public Metric(String metricTitle, String dayString, String metricValue) {
+        this.metricName = generateMetricName(metricTitle, dayString);
         this.metricValue = metricValue;
         this.lastCalledDate = new Timestamp(new Date().getTime());
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java b/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java
new file mode 100644
index 00000000000..fac2abeddb8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/PackagePopupFragmentBean.java
@@ -0,0 +1,32 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package edu.harvard.iq.dataverse;
+
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
+
+/**
+ *
+ * @author matthew
+ */
+
+@ViewScoped
+@Named
+public class PackagePopupFragmentBean implements java.io.Serializable {
+    
+    FileMetadata fm;
+    
+    public void setFileMetadata(FileMetadata fileMetadata) {
+        fm = fileMetadata;
+    }
+    
+    public FileMetadata getFileMetadata() {
+        return fm;
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
index 2803f8d4ceb..b92ede0b2b0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/PermissionServiceBean.java
@@ -31,17 +31,19 @@
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toList;
 import javax.persistence.Query;
 
 /**
  * Your one-stop-shop for deciding which user can do what action on which
  * objects (TM). Note that this bean accesses the permissions/user assignment on
- * a read-only basis. Changing the permissions a user has is done via roles and
- * groups, over at {@link DataverseRoleServiceBean}.
+ a read-only basis. Changing the permissions a user has is done via roles and
+ ras, over at {@link DataverseRoleServiceBean}.
  *
  * @author michael
  */
@@ -50,15 +52,15 @@
 public class PermissionServiceBean {
 
     private static final Logger logger = Logger.getLogger(PermissionServiceBean.class.getName());
-    
-    private static final Set PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY = 
-           EnumSet.copyOf(Arrays.asList(Permission.values()).stream()
-                    .filter( Permission::requiresAuthenticatedUser )
-                    .collect( Collectors.toList() ));
-    
+
+    private static final Set PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY
+            = EnumSet.copyOf(Arrays.asList(Permission.values()).stream()
+                    .filter(Permission::requiresAuthenticatedUser)
+                    .collect(Collectors.toList()));
+
     @EJB
     BuiltinUserServiceBean userService;
-    
+
     @EJB
     AuthenticationServiceBean authenticationService;
 
@@ -66,27 +68,31 @@ public class PermissionServiceBean {
     DataverseRoleServiceBean roleService;
 
     @EJB
-    RoleAssigneeServiceBean roleAssigneeService;    
-    
+    RoleAssigneeServiceBean roleAssigneeService;
+
     @EJB
     DataverseServiceBean dataverseService;
+    
+    @EJB
+    DvObjectServiceBean dvObjectServiceBean;
 
     @PersistenceContext
     EntityManager em;
 
     @EJB
     GroupServiceBean groupService;
-    
+
     @Inject
     DataverseSession session;
-    
+
     @Inject
     DataverseRequestServiceBean dvRequestService;
-    
+
     /**
-     * A request-level permission query (e.g includes IP groups).
+     * A request-level permission query (e.g includes IP ras).
      */
     public class RequestPermissionQuery {
+
         final DvObject subject;
         final DataverseRequest request;
 
@@ -94,59 +100,80 @@ public RequestPermissionQuery(DvObject subject, DataverseRequest request) {
             this.subject = subject;
             this.request = request;
         }
-        
+
         public Set get() {
-            return PermissionServiceBean.this.permissionsFor(request, subject);
+            return permissionsFor(request, subject);
         }
-
+        
         public boolean has(Permission p) {
-            return get().contains(p);
+            return hasPermissionsFor(request, subject, EnumSet.of(p));
+        }
+
+        /*
+         * This is a new and optimized method, for making a quick lookup on 
+         * a SET of permission all at once; it was originally called 
+         * has(Set p)... however, while unambiguos in Java, 
+         * the fact that there were 2 has() methods - has(Permission) and 
+         * has(Set) - was confusing PrimeFaces and resulting in 
+         * pages failing with "cannot convert "String" to "Set" error messages...
+         * so it had to be renamed to hasPermissions(...)
+        */
+        public boolean hasPermissions(Set p) {
+            if (p.isEmpty()) {
+                return true;
+            }
+            return hasPermissionsFor(request, subject, p);
         }
-        
-        public RequestPermissionQuery on( DvObject dvo ) {
+
+        public RequestPermissionQuery on(DvObject dvo) {
             return new RequestPermissionQuery(dvo, request);
         }
-        
+
         /**
-         * Tests whether a command of the passed class can be issued over the {@link DvObject}
-         * in the context of the current request. Note that since some commands have dynamic permissions, 
-         * in some cases it's better to instantiate a command object and pass it to {@link #canIssue(edu.harvard.iq.dataverse.engine.command.Command)}.
+         * Tests whether a command of the passed class can be issued over the
+         * {@link DvObject} in the context of the current request. Note that
+         * since some commands have dynamic permissions, in some cases it's
+         * better to instantiate a command object and pass it to
+         * {@link #canIssue(edu.harvard.iq.dataverse.engine.command.Command)}.
+         *
          * @param aCmdClass
-         * @return {@code true} iff instances of the command class can be issued in the context of the current request.
+         * @return {@code true} iff instances of the command class can be issued
+         * in the context of the current request.
          */
-        public boolean canIssue( Class aCmdClass ) {
+        public boolean canIssue(Class aCmdClass) {
             Map> required = CH.permissionsRequired(aCmdClass);
             if (required.isEmpty() || required.get("") == null) {
                 logger.fine("IsUserAllowedOn: empty-true");
                 return true;
             } else {
-                Set grantedUserPermissions = permissionsFor(request, subject);
                 Set requiredPermissionSet = required.get("");
-                return grantedUserPermissions.containsAll(requiredPermissionSet);
+                return hasPermissions(requiredPermissionSet);
             }
         }
-        
+
         /**
-         * Tests whether the command can be issued over the {@link DvObject}
-         * in the context of the current request. 
+         * Tests whether the command can be issued over the {@link DvObject} in
+         * the context of the current request.
+         *
          * @param aCmd
-         * @return {@code true} iff the command can be issued in the context of the current request.
+         * @return {@code true} iff the command can be issued in the context of
+         * the current request.
          */
-        public boolean canIssue( Command aCmd ) {
+        public boolean canIssue(Command aCmd) {
             Map> required = aCmd.getRequiredPermissions();
             if (required.isEmpty() || required.get("") == null) {
                 logger.fine("IsUserAllowedOn: empty-true");
                 return true;
             } else {
-                Set grantedUserPermissions = permissionsFor(request, subject);
                 Set requiredPermissionSet = required.get("");
-                return grantedUserPermissions.containsAll(requiredPermissionSet);
+                return hasPermissions(requiredPermissionSet);
             }
         }
     }
-    
+
     /**
-     * A permission query for a given role assignee. Does not cover request-level permissions.
+     * A permission query for a given role assignee. Does not cover
+     * request-level permissions.
      */
     public class StaticPermissionQuery {
 
@@ -164,13 +191,14 @@ public StaticPermissionQuery user(RoleAssignee anotherUser) {
 
         /**
          * "Fast and loose" query mechanism, allowing to pass the command class
-         * name, does not take request-level permissions into account. Command is assumed to live in
+         * name, does not take request-level permissions into account. Command
+         * is assumed to live in
          * {@code edu.harvard.iq.dataverse.engine.command.impl.}
          *
          * @deprecated Use DynamicPermissionQuery instead
          * @param commandName
          * @return {@code true} iff the user has the permissions required by the
-         * command on the object.
+ command on the object.
          * @throws ClassNotFoundException
          */
         @Deprecated
@@ -184,11 +212,11 @@ public Set get() {
         }
 
         public boolean has(Permission p) {
-            return get().contains(p);
+            return hasPermissionsFor(user, subject, EnumSet.of(p));
         }
 
         public boolean has(String pName) {
-            return get().contains(Permission.valueOf(pName));
+            return has(Permission.valueOf(pName));
         }
 
     }
@@ -197,139 +225,280 @@ public List assignmentsOn(DvObject d) {
         return em.createNamedQuery("RoleAssignment.listByDefinitionPointId", RoleAssignment.class)
                 .setParameter("definitionPointId", d.getId()).getResultList();
     }
-    
+
     /**
-     * Finds all the permissions the {@link User} in {@code req} has over 
-     * {@code dvo}, in the context of {@code req}.
-     * @param req 
-     * @param dvo
-     * @return Permissions of {@code req.getUser()} over {@code dvo}.
+     * Returns all the children (direct descendants) of {@code dvo}, on which the user 
+ has all the permissions specified in {@code permissions}. This method takes into
+     * account which permissions apply for which object type, so a permission that 
+     * applies only to {@link Dataset}s will not be considered when looking into
+     * the question of whether a {@link Dataverse} should be contained in the output list.
+     * @param req The request whose permissions are queried
+     * @param dvo The objects whose children we list
+     * @param required (sub)set of permissions {@code req} has on the objects in the returned list
+     * @param includeReleased include released dataverses and datasets without checking permissions
+     * @return list of {@code dvo} children over which {@code req} has at least {@code required} permissions.
      */
-    public Set permissionsFor( DataverseRequest req, DvObject dvo ) {
-        Set permissions = EnumSet.noneOf(Permission.class);
+    public List whichChildrenHasPermissionsFor(DataverseRequest req, DvObjectContainer dvo, Set required, boolean includeReleased) {
+        List children = dvObjectServiceBean.findByOwnerId(dvo.getId());
+        User user = req.getUser();
         
-        // Add permissions specifically given to the user
-        permissions.addAll( permissionsForSingleRoleAssignee(req.getUser(),dvo) );
-
-        Set groups = groupService.groupsFor(req,dvo);
+        // quick cases
+        if (user.isSuperuser()) {
+            return children; // it's good to be king
+            
+        } else if (!user.isAuthenticated()) {
+            if ( required.stream().anyMatch(PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY::contains) ){
+                // At least one of the permissions requires that the user is authenticated, which is not the case.
+                return Collections.emptyList();
+            }
+        }
+              
+        // Actually look at permissions
+        Set parents = getPermissionAncestors(dvo);
+        Set ras = new HashSet<>(groupService.groupsFor(req));
+        ras.add(user);
+        List parentsAsignments = roleService.directRoleAssignments(ras, parents);
         
-        // Add permissions gained from groups
-        for ( Group g : groups ) {
-            final Set groupPremissions = permissionsForSingleRoleAssignee(g,dvo);
-            permissions.addAll(groupPremissions);
+        for (RoleAssignment asmnt : parentsAsignments) {
+            required.removeAll(asmnt.getRole().permissions());
+        }
+        if (required.isEmpty()) {
+            // All permissions are met by role assignments on the request
+            return children;
         }
+        
+        // Looking at each child at a time now.
+        // 1. Map childs to permissions
+        List childrenAssignments = roleService.directRoleAssignments(ras, 
+                includeReleased ? children.stream().filter( child ->
+                    (!child.isReleased())).collect( toList()) : children);
+        
+        Map> roleMap = new HashMap<>();
+        childrenAssignments.forEach( assignment -> {
+            DvObject definitionPoint = assignment.getDefinitionPoint();
+            if (!roleMap.containsKey(definitionPoint)){
+                roleMap.put(definitionPoint, assignment.getRole().permissions());
+            } else {
+                roleMap.get(definitionPoint).addAll(assignment.getRole().permissions());
+            }
+        });
+        
+        // 2. Filter by permission map created at (1).
+        return children.stream().filter( child -> 
+                ((includeReleased && child.isReleased()) 
+                        || ((roleMap.containsKey(child)) &&
+                            (roleMap.get(child).containsAll(required.stream().filter(perm -> perm.appliesTo(child.getClass())).collect(Collectors.toSet())))))
+        ).collect( toList() );
+        
+    }
+    
+    // Convenience versions of the method above:  
+    // Same as above - but defaults to relying on permissions only 
+    // (i.e., does not automatically return released dataverses and datasets)
+    public List whichChildrenHasPermissionsFor(DataverseRequest req, DvObjectContainer dvo, Set required) {
+        return whichChildrenHasPermissionsFor(req, dvo, required, false);
+    }
+    
+    // A shortcut for calling the method above, with the assumption that all the
+    // released dataverses and datasets should be included: 
+    public List whichChildrenHasPermissionsForOrReleased(DataverseRequest req, DvObjectContainer dvo, Set required) {
+        return whichChildrenHasPermissionsFor(req, dvo, required, true);
+    }
 
-        if ( ! req.getUser().isAuthenticated() ) {
-            permissions.removeAll( PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY );
+    public boolean hasPermissionsFor(DataverseRequest req, DvObject dvo, Set required) {
+        User user = req.getUser();
+        if (user.isSuperuser()) {
+            return true;
+        } else if (!user.isAuthenticated()) {
+            Set requiredCopy = EnumSet.copyOf(required);
+            requiredCopy.retainAll(PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY);
+            if (!requiredCopy.isEmpty()) {
+                return false;
+            }
         }
         
-        return permissions;
+        Set ras = new HashSet<>(groupService.groupsFor(req, dvo));
+        ras.add(user);
+        return hasGroupPermissionsFor(ras, dvo, required);
+    }
+
+    public boolean hasPermissionsFor(RoleAssignee ra, DvObject dvo, Set required) {
+        if (ra instanceof User) {
+            User user = (User) ra;
+            if (user.isSuperuser()) {
+                return true;
+            } else if (!user.isAuthenticated()) {
+                Set requiredCopy = EnumSet.copyOf(required);
+                requiredCopy.retainAll(PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY);
+                if (!requiredCopy.isEmpty()) {
+                    return false;
+                }
+            }
+        }
+        required.removeAll(getInferredPermissions(dvo));
+        if (required.isEmpty()) {
+            return true;
+        }
+        
+        Set ras = new HashSet<>(groupService.groupsFor(ra, dvo));
+        ras.add(ra);
+        return hasGroupPermissionsFor(ras, dvo, required);
     }
     
+    private boolean hasGroupPermissionsFor(Set ras, DvObject dvo, Set required) {
+        for (RoleAssignment asmnt : assignmentsFor(ras, dvo)) {
+            required.removeAll(asmnt.getRole().permissions());
+        }
+        return required.isEmpty();
+    }
+
     /**
-     * Returns the set of permission a user/group has over a dataverse object. 
+     * Finds all the permissions the {@link User} in {@code req} has over
+ {@code dvo}, in the context of {@code req}.
+     *
+     * @param req
+     * @param dvo
+     * @return Permissions of {@code req.getUser()} over {@code dvo}.
+     */
+    public Set permissionsFor(DataverseRequest req, DvObject dvo) {
+        if (req.getUser().isSuperuser()) {
+            return EnumSet.allOf(Permission.class);
+        }
+
+        Set permissions = getInferredPermissions(dvo);
+
+        // Add permissions gained from ras
+        Set ras = new HashSet<>(groupService.groupsFor(req, dvo));
+        ras.add(req.getUser());
+        addGroupPermissionsFor(ras, dvo, permissions);
+
+        if (!req.getUser().isAuthenticated()) {
+            permissions.removeAll(PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY);
+        }
+        return permissions;
+    }
+
+    /**
+     * Returns the set of permission a user/group has over a dataverse object.
      * This method takes into consideration group memberships as well, but does
-     * not look into request-level groups.
+ not look into request-level ras.
+     *
      * @param ra The role assignee.
      * @param dvo The {@link DvObject} on which the user wants to operate
      * @return the set of permissions {@code ra} has over {@code dvo}.
      */
     public Set permissionsFor(RoleAssignee ra, DvObject dvo) {
-
-        Set permissions = EnumSet.noneOf(Permission.class);
-        
-        // Add permissions specifically given to the user
-        permissions.addAll( permissionsForSingleRoleAssignee(ra,dvo) );
-        
-        // Add permissions gained from groups
-        Set groupsRaBelongsTo = groupService.groupsFor(ra,dvo);
-        for ( Group g : groupsRaBelongsTo ) {
-            permissions.addAll( permissionsForSingleRoleAssignee(g,dvo) );
+        if (ra instanceof AuthenticatedUser && ((AuthenticatedUser) ra).isSuperuser()) {
+            return EnumSet.allOf(Permission.class);
         }
-        
-        if ( (ra instanceof User) && (! ((User)ra).isAuthenticated()) ) {
-            permissions.removeAll( PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY );
+
+        Set permissions = getInferredPermissions(dvo);
+
+        Set ras = new HashSet<>(groupService.groupsFor(ra, dvo));
+        ras.add(ra);
+        addGroupPermissionsFor(ras, dvo, permissions);
+
+        if ((ra instanceof User) && (!((User) ra).isAuthenticated())) {
+            permissions.removeAll(PERMISSIONS_FOR_AUTHENTICATED_USERS_ONLY);
         }
-        
         return permissions;
     }
-
     
-    private Set permissionsForSingleRoleAssignee(RoleAssignee ra, DvObject d) {
-        // super user check
-        // for 4.0, we are allowing superusers all permissions
-        // for secure data, we may need to restrict some of the permissions
-        if (ra instanceof AuthenticatedUser && ((AuthenticatedUser) ra).isSuperuser()) {
-            return EnumSet.allOf(Permission.class);
+    private void addGroupPermissionsFor(Set ras, DvObject dvo, Set permissions) {
+        for (RoleAssignment asmnt : assignmentsFor(ras, dvo)) {
+            permissions.addAll(asmnt.getRole().permissions());
         }
-        
-        // Start with no permissions, build from there.
-        Set retVal = EnumSet.noneOf(Permission.class);
+    }
+
+
+    /**
+     * Calculates permissions based on object state and other context
+     *
+     * @param dvo
+     * @return
+     */
+    private Set getInferredPermissions(DvObject dvo) {
 
-        // File special case.
-        if (d instanceof DataFile) {
+        Set permissions = EnumSet.noneOf(Permission.class);
+
+        if (isPublicallyDownloadable(dvo)) {
+            permissions.add(Permission.DownloadFile);
+        }
+
+        return permissions;
+    }
+
+    /**
+     * unrestricted files that are part of a release dataset automatically get
+     * download permission for everybody:
+     */
+    private boolean isPublicallyDownloadable(DvObject dvo) {
+        if (dvo instanceof DataFile) {
             // unrestricted files that are part of a release dataset 
             // automatically get download permission for everybody:
             //      -- L.A. 4.0 beta12
-            
-            DataFile df = (DataFile)d;
-            
+
+            DataFile df = (DataFile) dvo;
+
             if (!df.isRestricted()) {
                 if (df.getOwner().getReleasedVersion() != null) {
                     if (df.getOwner().getReleasedVersion().getFileMetadatas() != null) {
                         for (FileMetadata fm : df.getOwner().getReleasedVersion().getFileMetadatas()) {
                             if (df.equals(fm.getDataFile())) {
-                                retVal.add(Permission.DownloadFile);
-                                break;
+                                return true;
                             }
                         }
                     }
                 }
             }
         }
-        
-        // Direct assignments to ra on d
-        assignmentsFor(ra, d).forEach( 
-                asmnt -> retVal.addAll(asmnt.getRole().permissions())
-        );
-        
-        // Recurse up the group containment hierarchy.
-        groupService.groupsFor(ra, d).forEach(
-                grp -> retVal.addAll(permissionsForSingleRoleAssignee(grp, d)));
-        return retVal;
+        return false;
     }
 
     /**
      * Returns all the role assignments that are effective for {@code ra} over
      * {@code d}. Traverses the containment hierarchy of the {@code d}.
+     *
      * @param ra The role assignee whose role assignemnts we look for.
      * @param d The dataverse object over which the roles are assigned
      * @return A set of all the role assignments for {@code ra} over {@code d}.
      */
     public Set assignmentsFor(RoleAssignee ra, DvObject d) {
-        Set assignments = new HashSet<>();
+        return assignmentsFor(Collections.singleton(ra), d);
+    }
+
+    public Set assignmentsFor(Set ras, DvObject d) {
+        Set permAncestors = getPermissionAncestors(d);
+        return new HashSet<>(roleService.directRoleAssignments(ras, permAncestors));
+    }
+
+    public Set getPermissionAncestors(DvObject d) {
+        Set ancestors = new HashSet<>();
         while (d != null) {
-            assignments.addAll(roleService.directRoleAssignments(ra, d));
+            ancestors.add(d);
             if (d instanceof Dataverse && ((Dataverse) d).isEffectivelyPermissionRoot()) {
-                return assignments;
+                return ancestors;
             } else {
                 d = d.getOwner();
             }
         }
-
-        return assignments;
+        return ancestors;
     }
 
     /**
-     * For commands with no named dvObjects, this allows a quick check whether
-     * a user can issue the command on the dataverse or not.
+     * For commands with no named dvObjects, this allows a quick check whether a
+     * user can issue the command on the dataverse or not.
      *
      * @param u
      * @param commandClass
      * @param dvo
      * @return
-     * @deprecated As commands have dynamic permissions now, it is not enough to look at the static permissions anymore.
-     * @see #isUserAllowedOn(edu.harvard.iq.dataverse.authorization.RoleAssignee, edu.harvard.iq.dataverse.engine.command.Command, edu.harvard.iq.dataverse.DvObject) 
+     * @deprecated As commands have dynamic permissions now, it is not enough to
+     * look at the static permissions anymore.
+     * @see
+     * #isUserAllowedOn(edu.harvard.iq.dataverse.authorization.RoleAssignee,
+     * edu.harvard.iq.dataverse.engine.command.Command,
+     * edu.harvard.iq.dataverse.DvObject)
      */
     public boolean isUserAllowedOn(RoleAssignee u, Class commandClass, DvObject dvo) {
         Map> required = CH.permissionsRequired(commandClass);
@@ -346,9 +515,8 @@ private boolean isUserAllowedOn(RoleAssignee u, Map> req
             logger.fine("IsUserAllowedOn: empty-true");
             return true;
         } else {
-            Set grantedUserPermissions = permissionsFor(u, dvo);
             Set requiredPermissionSet = required.get("");
-            return grantedUserPermissions.containsAll(requiredPermissionSet);
+            return hasPermissionsFor(u, dvo, requiredPermissionSet);
         }
     }
 
@@ -369,25 +537,26 @@ public RequestPermissionQuery on(DvObject d) {
         }
         return requestOn(dvRequestService.getDataverseRequest(), d);
     }
-    
-    public RequestPermissionQuery requestOn( DataverseRequest req, DvObject dvo ) {
+
+    public RequestPermissionQuery requestOn(DataverseRequest req, DvObject dvo) {
         if (dvo.getId() == null) {
             throw new IllegalArgumentException("Cannot query permissions on a DvObject with a null id.");
         }
         return new RequestPermissionQuery(dvo, req);
     }
-    
-    public RequestPermissionQuery request( DataverseRequest req ) {
+
+    public RequestPermissionQuery request(DataverseRequest req) {
         return new RequestPermissionQuery(null, req);
     }
-    
+
     /**
      * Go from (User, Permission) to a list of Dataverse objects that the user
-     * has the permission on.
+ has the permission on.
      *
      * @param user
      * @param permission
-     * @return The list of dataverses {@code user} has permission {@code permission} on.
+     * @return The list of dataverses {@code user} has permission
+ {@code permission} on.
      */
     public List getDataversesUserHasPermissionOn(AuthenticatedUser user, Permission permission) {
         Set groups = groupService.groupsFor(user);
@@ -409,20 +578,20 @@ public List getDataversesUserHasPermissionOn(AuthenticatedUser user,
         }
         return dataversesUserHasPermissionOn;
     }
-    
+
     public List getUsersWithPermissionOn(Permission permission, DvObject dvo) {
         List usersHasPermissionOn = new LinkedList<>();
         Set ras = roleService.rolesAssignments(dvo);
         for (RoleAssignment ra : ras) {
             if (ra.getRole().permissions().contains(permission)) {
                 RoleAssignee raee = roleAssigneeService.getRoleAssignee(ra.getAssigneeIdentifier());
-                usersHasPermissionOn.addAll(roleAssigneeService.getExplicitUsers(raee));      
+                usersHasPermissionOn.addAll(roleAssigneeService.getExplicitUsers(raee));
             }
         }
-        
+
         return usersHasPermissionOn;
     }
-    
+
     public Map getDistinctUsersWithPermissionOn(Permission permission, DvObject dvo) {
 
         List users = getUsersWithPermissionOn(permission, dvo);
@@ -432,8 +601,8 @@ public Map getDistinctUsersWithPermissionOn(Permissio
         });
 
         return distinctUsers;
-    } 
-    
+    }
+
     public List getDvObjectsUserHasRoleOn(User user) {
         return getDvObjectIdsUserHasRoleOn(user, null, null, false);
     }
@@ -446,8 +615,7 @@ public List getDvObjectIdsUserHasRoleOn(User user, List rol
     Method takes in a user and optional list of roles and dvobject type
     queries the role assigment table filtering by optional roles and dv
     returns dvobject ids
-    */
-    
+     */
     private String getRolesClause(List roles) {
         StringBuilder roleStringBld = new StringBuilder();
         if (roles != null && !roles.isEmpty()) {
@@ -480,12 +648,10 @@ private String getTypesClause(List types) {
         }
         return typeStringBld.toString();
     }
-    
-       
-    public List getDvObjectIdsUserHasRoleOn(User user, List roles, List types, boolean indirect) {
 
+    public List getDvObjectIdsUserHasRoleOn(User user, List roles, List types, boolean indirect) {
 
-        String roleString = getRolesClause (roles);
+        String roleString = getRolesClause(roles);
         String typeString = getTypesClause(types);
 
         Query nativeQuery = em.createNativeQuery("SELECT id FROM dvobject WHERE "
@@ -506,7 +672,7 @@ public List getDvObjectIdsUserHasRoleOn(User user, List rol
                 }
             }
         }
-        
+
         // Get child datasets and files
         if (indirect) {
             indirectParentIds += ") ";
@@ -535,12 +701,11 @@ public List getDvObjectIdsUserHasRoleOn(User user, List rol
 
             for (int dvIdAsInt : childFileIds) {
                 dataversesUserHasPermissionOn.add(Long.valueOf(dvIdAsInt));
-
             }
         }
         return dataversesUserHasPermissionOn;
     }
-    
+
     public void checkEditDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
         if (dataset.isLocked()) {
             if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
@@ -565,7 +730,7 @@ public void checkEditDatasetLock(Dataset dataset, DataverseRequest dataverseRequ
             }
         }
     }
-    
+
     public void checkDownloadFileLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
         if (dataset.isLocked()) {
             if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
@@ -577,7 +742,7 @@ public void checkDownloadFileLock(Dataset dataset, DataverseRequest dataverseReq
             if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
                 throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
             }
-             if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
+            if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
                 throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.downloadNotAllowed"), command);
             }
             // TODO: Do we need to check for "Workflow"? Should the message be more specific?
diff --git a/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java b/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java
index 5bfd55134b0..6241f120f80 100644
--- a/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/RoleAssignment.java
@@ -33,8 +33,12 @@
 @NamedQueries({
 	@NamedQuery( name  = "RoleAssignment.listByAssigneeIdentifier_DefinitionPointId",
 				 query = "SELECT r FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier AND r.definitionPoint.id=:definitionPointId" ),
+    	@NamedQuery( name  = "RoleAssignment.listByAssigneeIdentifier_DefinitionPointId_RoleId",
+				 query = "SELECT r FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier AND r.definitionPoint.id=:definitionPointId and r.role.id=:roleId" ),
 	@NamedQuery( name  = "RoleAssignment.listByAssigneeIdentifier",
 				 query = "SELECT r FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier" ),
+	@NamedQuery( name  = "RoleAssignment.listByAssigneeIdentifiers",
+				 query = "SELECT r FROM RoleAssignment r WHERE r.assigneeIdentifier in :assigneeIdentifiers AND r.definitionPoint.id in :definitionPointIds" ),
 	@NamedQuery( name  = "RoleAssignment.listByDefinitionPointId",
 				 query = "SELECT r FROM RoleAssignment r WHERE r.definitionPoint.id=:definitionPointId" ),
 	@NamedQuery( name  = "RoleAssignment.listByRoleId",
@@ -44,7 +48,9 @@
 	@NamedQuery( name  = "RoleAssignment.deleteByAssigneeIdentifier_RoleIdDefinition_PointId",
 				 query = "DELETE FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier AND r.role.id=:roleId AND r.definitionPoint.id=:definitionPointId"),
         @NamedQuery( name = "RoleAssignment.deleteAllByAssigneeIdentifier",
-				 query = "DELETE FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier")
+				 query = "DELETE FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier"),
+        @NamedQuery( name = "RoleAssignment.deleteAllByAssigneeIdentifier_Definition_PointId_RoleType",
+				 query = "DELETE FROM RoleAssignment r WHERE r.assigneeIdentifier=:assigneeIdentifier AND r.role.id=:roleId and r.definitionPoint.id=:definitionPointId")
 })
 public class RoleAssignment implements java.io.Serializable {
 	@Id
diff --git a/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java b/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
index f5310119150..953fbeeb820 100644
--- a/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/S3PackageImporter.java
@@ -21,10 +21,10 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
-import edu.harvard.iq.dataverse.util.FileUtil;
-import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
+import edu.harvard.iq.dataverse.util.FileUtil;;
+import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -34,8 +34,6 @@
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.inject.Named;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
 
 /**
  * This class is for importing files added to s3 outside of dataverse.
@@ -59,6 +57,7 @@ public class S3PackageImporter extends AbstractApiBean implements java.io.Serial
     @EJB
     EjbDataverseEngine commandEngine;
     
+    //Copies from another s3 bucket to our own
     public void copyFromS3(Dataset dataset, String s3ImportPath) throws IOException {
         try {
             s3 = AmazonS3ClientBuilder.standard().defaultClient();
@@ -67,11 +66,7 @@ public void copyFromS3(Dataset dataset, String s3ImportPath) throws IOException
                     "Cannot instantiate a S3 client using; check your AWS credentials and region",
                     e);
         }
-
-        JsonObjectBuilder bld = jsonObjectBuilder();
-
-        String fileMode = FileRecordWriter.FILE_MODE_PACKAGE_FILE;
-
+        
         String dcmBucketName = System.getProperty("dataverse.files.dcm-s3-bucket-name");
         String dcmDatasetKey = s3ImportPath;
         String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
@@ -133,80 +128,118 @@ public void copyFromS3(Dataset dataset, String s3ImportPath) throws IOException
                 throw new IOException("Failed to delete object" + new Object[]{item});
             }
         }
-
     }
     
-    public DataFile createPackageDataFile(Dataset dataset, String folderName, long totalSize) {
-            DataFile packageFile = new DataFile(DataFileServiceBean.MIME_TYPE_PACKAGE_FILE);
-            packageFile.setChecksumType(DataFile.ChecksumType.SHA1);
-            
-            FileUtil.generateStorageIdentifier(packageFile);
-            
-            
-            String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
-            String dvDatasetKey = getS3DatasetKey(dataset);
-            S3Object s3object = null; 
-
-            s3object = s3.getObject(new GetObjectRequest(dvBucketName, dvDatasetKey+"/files.sha"));
-           
-            InputStream in = s3object.getObjectContent();
-            String checksumVal = FileUtil.CalculateChecksum(in, packageFile.getChecksumType());
+    public DataFile createPackageDataFile(Dataset dataset, String folderName, long totalSize) throws IOException {
+        DataFile packageFile = new DataFile(DataFileServiceBean.MIME_TYPE_PACKAGE_FILE);
+        packageFile.setChecksumType(DataFile.ChecksumType.SHA1);
 
-            packageFile.setChecksumValue(checksumVal); 
+        //This is a brittle calculation, changes of the dcm post_upload script will blow this up
+        String rootPackageName = "package_" + folderName.replace("/", "");
 
-            packageFile.setFilesize(totalSize);
-            packageFile.setModificationTime(new Timestamp(new Date().getTime()));
-            packageFile.setCreateDate(new Timestamp(new Date().getTime()));
-            packageFile.setPermissionModificationTime(new Timestamp(new Date().getTime()));
-            packageFile.setOwner(dataset);
-            dataset.getFiles().add(packageFile);
+        String dvBucketName = System.getProperty("dataverse.files.s3-bucket-name");
+        String dvDatasetKey = getS3DatasetKey(dataset);
 
-            packageFile.setIngestDone();
+        //getting the name of the .sha file via substring, ${packageName}.sha
+        logger.log(Level.INFO, "shaname {0}", new Object[]{rootPackageName  + ".sha"});
 
-            // set metadata and add to latest version
-            FileMetadata fmd = new FileMetadata();
-            fmd.setLabel(folderName.substring(folderName.lastIndexOf('/') + 1));
-            
-            fmd.setDataFile(packageFile);
-            packageFile.getFileMetadatas().add(fmd);
-            if (dataset.getLatestVersion().getFileMetadatas() == null) dataset.getLatestVersion().setFileMetadatas(new ArrayList<>());
+        if(!s3.doesObjectExist(dvBucketName, dvDatasetKey + "/" + rootPackageName + ".zip")) {
+            throw new IOException ("S3 Package data file could not be found after copy from dcm. Name: " + dvDatasetKey + "/" + rootPackageName + ".zip");
+        }
 
-            dataset.getLatestVersion().getFileMetadatas().add(fmd);
-            fmd.setDatasetVersion(dataset.getLatestVersion());
-            
-            GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(packageFile.getProtocol(), commandEngine.getContext());
-            if (packageFile.getIdentifier() == null || packageFile.getIdentifier().isEmpty()) {
-                String packageIdentifier = dataFileServiceBean.generateDataFileIdentifier(packageFile, idServiceBean);
-                packageFile.setIdentifier(packageIdentifier);
-            }
-            
-            String nonNullDefaultIfKeyNotFound = "";
-            String protocol = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
-            String authority = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
+        S3Object s3FilesSha = s3.getObject(new GetObjectRequest(dvBucketName, dvDatasetKey + "/" + rootPackageName  + ".sha"));
 
-            if (packageFile.getProtocol() == null) {
-                packageFile.setProtocol(protocol);
+        InputStreamReader str = new InputStreamReader(s3FilesSha.getObjectContent());
+        BufferedReader reader = new BufferedReader(str);
+        String checksumVal = "";
+        try {
+            String line;
+            while((line = reader.readLine()) != null && checksumVal.isEmpty()) {
+                logger.log(Level.FINE, "line {0}", new Object[]{line});
+                String[] splitLine = line.split("  ");
+
+                //the sha file should only contain one entry, but incase it doesn't we will check for the one for our zip
+                if(splitLine[1].contains(rootPackageName + ".zip")) { 
+                    checksumVal = splitLine[0];
+                    logger.log(Level.FINE, "checksumVal found {0}", new Object[]{checksumVal});
+                }
             }
-            if (packageFile.getAuthority() == null) {
-                packageFile.setAuthority(authority);
+            if(checksumVal.isEmpty()) {
+                logger.log(Level.SEVERE, "No checksum found for uploaded DCM S3 zip on dataset {0}", new Object[]{dataset.getIdentifier()});
+            }                
+        } catch (IOException ex){
+            logger.log(Level.SEVERE, "Error parsing DCM s3 checksum file on dataset {0} . Error: {1} ", new Object[]{dataset.getIdentifier(), ex});
+        } finally {
+            try {
+                str.close();
+                reader.close();
+            } catch (IOException ex) {
+                logger.log(Level.WARNING, "errors closing s3 DCM object reader stream: {0}", new Object[]{ex});
             }
 
-            if (!packageFile.isIdentifierRegistered()) {
-                String doiRetString = "";
-                idServiceBean = GlobalIdServiceBean.getBean(commandEngine.getContext());
-                try {
-                    doiRetString = idServiceBean.createIdentifier(packageFile);
-                } catch (Throwable e) {
-                    
-                }
+        }
+
+        logger.log(Level.FINE, "Checksum value for the package in Dataset {0} is: {1}", 
+           new Object[]{dataset.getIdentifier(), checksumVal});
+
+        packageFile.setChecksumValue(checksumVal); 
+
+        packageFile.setFilesize(totalSize);
+        packageFile.setModificationTime(new Timestamp(new Date().getTime()));
+        packageFile.setCreateDate(new Timestamp(new Date().getTime()));
+        packageFile.setPermissionModificationTime(new Timestamp(new Date().getTime()));
+        packageFile.setOwner(dataset);
+        dataset.getFiles().add(packageFile);
+
+        packageFile.setIngestDone();
+
+        // set metadata and add to latest version
+        // Set early so we can generate the storage id with the info
+        FileMetadata fmd = new FileMetadata();
+        fmd.setLabel(rootPackageName + ".zip");
+
+        fmd.setDataFile(packageFile);
+        packageFile.getFileMetadatas().add(fmd);
+        if (dataset.getLatestVersion().getFileMetadatas() == null) dataset.getLatestVersion().setFileMetadatas(new ArrayList<>());
+
+        dataset.getLatestVersion().getFileMetadatas().add(fmd);
+        fmd.setDatasetVersion(dataset.getLatestVersion());
+
+        FileUtil.generateS3PackageStorageIdentifier(packageFile);
+
+        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(packageFile.getProtocol(), commandEngine.getContext());
+        if (packageFile.getIdentifier() == null || packageFile.getIdentifier().isEmpty()) {
+            String packageIdentifier = dataFileServiceBean.generateDataFileIdentifier(packageFile, idServiceBean);
+            packageFile.setIdentifier(packageIdentifier);
+        }
+
+        String nonNullDefaultIfKeyNotFound = "";
+        String protocol = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
+        String authority = commandEngine.getContext().settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
+
+        if (packageFile.getProtocol() == null) {
+            packageFile.setProtocol(protocol);
+        }
+        if (packageFile.getAuthority() == null) {
+            packageFile.setAuthority(authority);
+        }
+
+        if (!packageFile.isIdentifierRegistered()) {
+            String doiRetString = "";
+            idServiceBean = GlobalIdServiceBean.getBean(commandEngine.getContext());
+            try {
+                doiRetString = idServiceBean.createIdentifier(packageFile);
+            } catch (Throwable e) {
 
-                // Check return value to make sure registration succeeded
-                if (!idServiceBean.registerWhenPublished() && doiRetString.contains(packageFile.getIdentifier())) {
-                    packageFile.setIdentifierRegistered(true);
-                    packageFile.setGlobalIdCreateTime(new Date());
-                }
             }
 
+            // Check return value to make sure registration succeeded
+            if (!idServiceBean.registerWhenPublished() && doiRetString.contains(packageFile.getIdentifier())) {
+                packageFile.setIdentifierRegistered(true);
+                packageFile.setGlobalIdCreateTime(new Date());
+            }
+        }
+
         return packageFile;
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
index 0c4432073b7..f3efc0a1e7b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
@@ -150,6 +150,14 @@ public boolean isRsyncDownload() {
         return systemConfig.isRsyncDownload();
     }
     
+    public boolean isRsyncOnly() {
+        return systemConfig.isRsyncOnly();
+    }
+    
+    public boolean isHTTPUpload(){
+        return systemConfig.isHTTPUpload();
+    }
+    
     public boolean isDataFilePIDSequentialDependent(){
         return systemConfig.isDataFilePIDSequentialDependent();
     }
@@ -165,9 +173,28 @@ public String getSupportTeamEmail() {
         InternetAddress systemAddress = MailUtil.parseSystemAddress(systemEmail);        
         return BrandingUtil.getSupportTeamEmailAddress(systemAddress) != null ? BrandingUtil.getSupportTeamEmailAddress(systemAddress) : BrandingUtil.getSupportTeamName(systemAddress, dataverseService.findRootDataverse().getName());
     }
+    
+    public Integer getUploadMethodsCount() {
+        return systemConfig.getUploadMethodCount();
+    }
 
     public boolean isRootDataverseThemeDisabled() {
         return isTrueForKey(Key.DisableRootDataverseTheme, false);
     }
+    
+    public String getDropBoxKey() {
+
+        String configuredDropBoxKey = System.getProperty("dataverse.dropbox.key");
+        if (configuredDropBoxKey != null) {
+            return configuredDropBoxKey;
+        }
+        return "";
+    }
+    
+    public Boolean isHasDropBoxKey() {
+
+        return !getDropBoxKey().isEmpty();
+    }
+
 }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/Shib.java b/src/main/java/edu/harvard/iq/dataverse/Shib.java
index bb87cf6d5dd..8baa24067d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Shib.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Shib.java
@@ -320,6 +320,7 @@ public String confirmAndConvertAccount() {
         logger.fine("builtin username: " + builtinUsername);
         AuthenticatedUser builtInUserToConvert = authSvc.canLogInAsBuiltinUser(builtinUsername, builtinPassword);
         if (builtInUserToConvert != null) {
+            // TODO: Switch from authSvc.convertBuiltInToShib to authSvc.convertBuiltInUserToRemoteUser
             AuthenticatedUser au = authSvc.convertBuiltInToShib(builtInUserToConvert, shibAuthProvider.getId(), userIdentifier);
             if (au != null) {
                 authSvc.updateAuthenticatedUser(au, displayInfo);
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
index 634cc0868e0..e2da5f9af0a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
@@ -47,15 +47,14 @@ public Template findByDeafultTemplateOwnerId(Long ownerId) {
         return query.getSingleResult();
     }
 
-    
     public List findDataversesByDefaultTemplateId(Long defaultTemplateId) {
         TypedQuery query = em.createQuery("select object(o) from Dataverse as o where o.defaultTemplate.id =:defaultTemplateId order by o.name", Dataverse.class);
         query.setParameter("defaultTemplateId", defaultTemplateId);
         return query.getResultList();
     }
-    
+
     public void incrementUsageCount(Long templateId) {
-       
+
         Template toUpdate = em.find(Template.class, templateId);
         Long usage = toUpdate.getUsageCount();
         usage++;
diff --git a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
index 89a91c4c900..3ca8876bf2d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
@@ -279,13 +279,13 @@ public String save() {
             commandEngine.submit(cmd);
         } catch (Exception ex) {
             logger.log(Level.SEVERE, "error updating dataverse theme", ex);
-           FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataverse.save.failed"), JH.localize("dataverse.theme.failure")));
+           FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataverse.save.failed"), BundleUtil.getStringFromBundle("dataverse.theme.failure")));
         
           return null;
         } finally {
               this.cleanupTempDirectory(); 
         }
-        JsfHelper.addSuccessMessage(JH.localize("dataverse.theme.success"));    
+        JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.theme.success"));    
         return "dataverse.xhtml?faces-redirect=true&alias="+editDv.getAlias();  // go to dataverse page 
     }
       
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
index bac9589228c..aaed534d944 100644
--- a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
+++ b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
@@ -1,6 +1,8 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.util.DateUtil;
+
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
@@ -37,6 +39,9 @@ public enum Type {
     @ManyToOne
     @JoinColumn( nullable = false )
     private AuthenticatedUser user;
+    @ManyToOne
+    @JoinColumn( nullable = true )
+    private AuthenticatedUser requestor;
     private Timestamp sendDate;
     private boolean readNotification;
     
@@ -68,6 +73,14 @@ public AuthenticatedUser getUser() {
     public void setUser(AuthenticatedUser user) {
         this.user = user;
     }
+        
+    public AuthenticatedUser getRequestor() {
+        return requestor;
+    }
+
+    public void setRequestor(AuthenticatedUser requestor) {
+        this.requestor = requestor;
+    }
 
     public String getSendDate() {
         return new SimpleDateFormat("MMMM d, yyyy h:mm a z").format(sendDate);
@@ -136,4 +149,8 @@ public String getRoleString() {
     public void setRoleString(String roleString) {
         this.roleString = roleString;
     }
+
+    public String getLocaleSendDate() {
+        return DateUtil.formatDate(sendDate);
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java
index 60ad221ab6c..8e939de985b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/UserNotificationServiceBean.java
@@ -82,12 +82,18 @@ public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate
     }
     
     public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate, Type type, Long objectId, String comment) {
+        sendNotification(dataverseUser, sendDate, type, objectId, comment, null);
+    }
+    
+    public void sendNotification(AuthenticatedUser dataverseUser, Timestamp sendDate, Type type, Long objectId, String comment, AuthenticatedUser requestor) {
         UserNotification userNotification = new UserNotification();
         userNotification.setUser(dataverseUser);
         userNotification.setSendDate(sendDate);
         userNotification.setType(type);
         userNotification.setObjectId(objectId);
-        if (mailService.sendNotificationEmail(userNotification)) {
+        userNotification.setRequestor(requestor);
+        
+        if (mailService.sendNotificationEmail(userNotification, comment, requestor)) {
             logger.fine("email was sent");
             userNotification.setEmailed(true);
             save(userNotification);
diff --git a/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java b/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java
index 6b3ca20a016..31a9ad25e5b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java
+++ b/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java
@@ -67,7 +67,7 @@ public enum ActionType {
     
     private String actionSubType;
     
-    @Column(length = 1024)
+    @Column(columnDefinition="TEXT")
     private String info;
     
     public ActionLogRecord(){}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Access.java b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
index 02f6f427027..20ed63fa789 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Access.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Access.java
@@ -10,18 +10,28 @@
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
+import edu.harvard.iq.dataverse.DataverseRoleServiceBean;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DataverseTheme;
 import edu.harvard.iq.dataverse.GuestbookResponse;
 import edu.harvard.iq.dataverse.GuestbookResponseServiceBean;
 import edu.harvard.iq.dataverse.PermissionServiceBean;
+import edu.harvard.iq.dataverse.PermissionsWrapper;
+import edu.harvard.iq.dataverse.RoleAssignment;
+import edu.harvard.iq.dataverse.UserNotification;
+import edu.harvard.iq.dataverse.UserNotificationServiceBean;
+import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.RoleAssignee;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.PrivateUrlUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
@@ -34,11 +44,20 @@
 import edu.harvard.iq.dataverse.dataaccess.StoredOriginalFile;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.AssignRoleCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.CreateExplicitGroupCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.RequestAccessCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.RevokeRoleCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.export.DDIExportServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
 import edu.harvard.iq.dataverse.worldmapauth.WorldMapTokenServiceBean;
 
 import java.util.logging.Logger;
@@ -49,11 +68,22 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 import javax.inject.Inject;
+import javax.json.Json;
+import javax.json.JsonObjectBuilder;
+import java.math.BigDecimal;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Consumer;
+import javax.json.JsonArrayBuilder;
+import javax.persistence.TypedQuery;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -67,12 +97,15 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.PUT;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.ServiceUnavailableException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
+import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 import javax.ws.rs.core.StreamingOutput;
 
 /*
@@ -123,6 +156,12 @@ public class Access extends AbstractApiBean {
     DataverseRequestServiceBean dvRequestService;
     @EJB
     GuestbookResponseServiceBean guestbookResponseService;
+    @EJB
+    DataverseRoleServiceBean roleService;
+    @EJB
+    UserNotificationServiceBean userNotificationService;
+    @Inject
+    PermissionsWrapper permissionsWrapper;
     
     
     private static final String API_KEY_HEADER = "X-Dataverse-key";    
@@ -255,12 +294,13 @@ public DownloadInstance datafile(@PathParam("fileId") String fileId, @QueryParam
         }
         for (String key : uriInfo.getQueryParameters().keySet()) {
             String value = uriInfo.getQueryParameters().getFirst(key);
-            
+            logger.fine("is download service supported? key="+key+", value="+value);
+
             if (downloadInstance.checkIfServiceSupportedAndSetConverter(key, value)) {
-                logger.fine("is download service supported? key="+key+", value="+value);
                 // this automatically sets the conversion parameters in 
                 // the download instance to key and value;
                 // TODO: I should probably set these explicitly instead. 
+                logger.fine("yes!");
                 
                 if (downloadInstance.getConversionParam().equals("subset")) {
                     String subsetParam = downloadInstance.getConversionParamValue();
@@ -538,23 +578,25 @@ public void write(OutputStream os) throws IOException,
                                         //without doing a large deal of rewriting or architecture redo.
                                         //The previous size checks for non-original download is still quick.
                                         //-MAD 4.9.2
-                                        DataAccessRequest daReq = new DataAccessRequest();
-                                        StorageIO accessObject = DataAccess.getStorageIO(file, daReq);
-
-                                        if (accessObject != null) {
-                                            Boolean gotOriginal = false;
-                                            StoredOriginalFile sof = new StoredOriginalFile();
-                                            StorageIO tempAccessObject = sof.retreive(accessObject);
-                                            if(null != tempAccessObject) { //If there is an original, use it
-                                                gotOriginal = true;
-                                                accessObject = tempAccessObject; 
-                                            } 
-                                            if(!gotOriginal) { //if we didn't get this from sof.retreive we have to open it
-                                                accessObject.open();
-                                            }
-                                            size = accessObject.getSize(); 
+                                        // OK, here's the better solution: we now store the size of the original file in 
+                                        // the database (in DataTable), so we get it for free. 
+                                        // However, there may still be legacy datatables for which the size is not saved. 
+                                        // so the "inefficient" code is kept, below, as a fallback solution. 
+                                        // -- L.A., 4.10
+                                        
+                                        if (file.getDataTable().getOriginalFileSize() != null) {
+                                            size = file.getDataTable().getOriginalFileSize();
+                                        } else {
+                                            DataAccessRequest daReq = new DataAccessRequest();
+                                            StorageIO storageIO = DataAccess.getStorageIO(file, daReq);
+                                            storageIO.open();
+                                            size = storageIO.getAuxObjectSize(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+
+                                            // save it permanently: 
+                                            file.getDataTable().setOriginalFileSize(size);
+                                            fileService.saveDataTable(file.getDataTable());
                                         }
-                                        if(size == 0L){
+                                        if (size == 0L){
                                             throw new IOException("Invalid file size or accessObject when checking limits of zip file");
                                         }
                                     } else {
@@ -651,15 +693,14 @@ public InputStream fileCardImage(@PathParam("fileId") Long fileId, @Context UriI
                         || "application/zipped-shapefile".equalsIgnoreCase(df.getContentType())) {
 
                     thumbnailDataAccess = ImageThumbConverter.getImageThumbnailAsInputStream(dataAccess, 48);
+                    if (thumbnailDataAccess != null && thumbnailDataAccess.getInputStream() != null) {
+                        return thumbnailDataAccess.getInputStream();
+                    }
                 }
             }
         } catch (IOException ioEx) {
             return null;
         }
-        
-        if (thumbnailDataAccess != null && thumbnailDataAccess.getInputStream() != null) {
-            return thumbnailDataAccess.getInputStream();
-        }
 
         return null; 
     }
@@ -695,6 +736,9 @@ public InputStream dsCardImage(@PathParam("versionId") Long versionId, @Context
                         dataAccess.open();
                         thumbnailDataAccess = ImageThumbConverter.getImageThumbnailAsInputStream(dataAccess, 48);
                     }
+                    if (thumbnailDataAccess != null && thumbnailDataAccess.getInputStream() != null) {
+                        return thumbnailDataAccess.getInputStream();
+                    } 
                 } catch (IOException ioEx) {
                     thumbnailDataAccess = null; 
                 }
@@ -711,10 +755,6 @@ public InputStream dsCardImage(@PathParam("versionId") Long versionId, @Context
                 }
             }*/
             
-            if (thumbnailDataAccess != null && thumbnailDataAccess.getInputStream() != null) {
-                return thumbnailDataAccess.getInputStream();
-            } 
-            
         }
 
         return null; 
@@ -880,6 +920,359 @@ private String getWebappImageResource(String imageName) {
     }
     */
     
+    /**
+     * Allow (or disallow) access requests to Dataset
+     *
+     * @author sekmiller
+     *
+     * @param datasetToAllowAccessId
+     * @param requestStr
+     * @return
+     */
+    @PUT
+    @Path("{id}/allowAccessRequest")
+    public Response allowAccessRequest(@PathParam("id") String datasetToAllowAccessId, String requestStr) {
+
+        DataverseRequest dataverseRequest = null;
+        Dataset dataset;
+
+        try {
+            dataset = findDatasetOrDie(datasetToAllowAccessId);
+        } catch (WrappedResponse ex) {
+            List args = Arrays.asList(datasetToAllowAccessId);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.allowRequests.failure.noDataset", args));
+        }
+
+        boolean allowRequest = Boolean.valueOf(requestStr);
+
+        try {
+            dataverseRequest = createDataverseRequest(findUserOrDie());
+        } catch (WrappedResponse wr) {
+            List args = Arrays.asList(wr.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+        }
+
+        dataset.getEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(allowRequest);
+
+        try {
+            engineSvc.submit(new UpdateDatasetVersionCommand(dataset, dataverseRequest));
+        } catch (CommandException ex) {
+            List args = Arrays.asList(dataset.getDisplayName(), ex.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noSave", args));
+        }
+
+        String text = allowRequest ? BundleUtil.getStringFromBundle("access.api.allowRequests.allows") : BundleUtil.getStringFromBundle("access.api.allowRequests.disallows");
+        List args = Arrays.asList(dataset.getDisplayName(), text);
+        return ok(BundleUtil.getStringFromBundle("access.api.allowRequests.success", args));
+        
+    }
+
+    /**
+     * Request Access to Restricted File
+     *
+     * @author sekmiller
+     *
+     * @param fileToRequestAccessId
+     * @param apiToken
+     * @param headers
+     * @return
+     */
+    @PUT
+    @Path("/datafile/{id}/requestAccess")
+    public Response requestFileAccess(@PathParam("id") String fileToRequestAccessId, @Context HttpHeaders headers) {
+        
+        DataverseRequest dataverseRequest;
+        DataFile dataFile;
+        
+        try {
+            dataFile = findDataFileOrDie(fileToRequestAccessId);
+        } catch (WrappedResponse ex) {
+            List args = Arrays.asList(fileToRequestAccessId);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.fileNotFound", args));
+        }
+
+        if (!dataFile.getOwner().isFileAccessRequest()) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.requestsNotAccepted"));
+        }
+
+        AuthenticatedUser requestor;
+
+        try {
+            requestor = findAuthenticatedUserOrDie();
+            dataverseRequest = createDataverseRequest(requestor);
+        } catch (WrappedResponse wr) {
+            List args = Arrays.asList(wr.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+        }
+
+        if (isAccessAuthorized(dataFile, getRequestApiKey())) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.failure.invalidRequest"));
+        }
+
+        if (dataFile.getFileAccessRequesters().contains(requestor)) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.failure.requestExists"));
+        }
+
+        try {
+            engineSvc.submit(new RequestAccessCommand(dataverseRequest, dataFile, true));
+        } catch (CommandException ex) {
+            List args = Arrays.asList(dataFile.getDisplayName(), ex.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.failure.commandError", args));
+        }
+        
+        List args = Arrays.asList(dataFile.getDisplayName());
+        return ok(BundleUtil.getStringFromBundle("access.api.requestAccess.success.for.single.file", args));
+
+    }
+
+    /*
+     * List Reqeusts to restricted file
+     *
+     * @author sekmiller
+     *
+     * @param fileToRequestAccessId
+     * @param apiToken
+     * @param headers
+     * @return
+     */
+    @GET
+    @Path("/datafile/{id}/listRequests")
+    public Response listFileAccessRequests(@PathParam("id") String fileToRequestAccessId, @Context HttpHeaders headers) {
+
+        DataverseRequest dataverseRequest;
+
+        DataFile dataFile;
+        try {
+            dataFile = findDataFileOrDie(fileToRequestAccessId);
+        } catch (WrappedResponse ex) {
+            List args = Arrays.asList(fileToRequestAccessId);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestList.fileNotFound", args));
+        }
+
+        try {
+            dataverseRequest = createDataverseRequest(findUserOrDie());
+        } catch (WrappedResponse wr) {
+            List args = Arrays.asList(wr.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+        }
+
+        if (!(dataverseRequest.getAuthenticatedUser().isSuperuser() || permissionService.requestOn(dataverseRequest, dataFile.getOwner()).has(Permission.ManageDatasetPermissions))) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.rejectAccess.failure.noPermissions"));
+        }
+
+        List requesters = dataFile.getFileAccessRequesters();
+
+        if (requesters == null || requesters.isEmpty()) {
+            List args = Arrays.asList(dataFile.getDisplayName());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestList.noRequestsFound"));
+        }
+
+        JsonArrayBuilder userArray = Json.createArrayBuilder();
+
+        for (AuthenticatedUser au : requesters) {
+            userArray.add(json(au));
+        }
+
+        return ok(userArray);
+
+    }
+
+    /**
+     * Grant Access to Restricted File
+     *
+     * @author sekmiller
+     *
+     * @param fileToRequestAccessId
+     * @param identifier
+     * @param apiToken
+     * @param headers
+     * @return
+     */
+    @PUT
+    @Path("/datafile/{id}/grantAccess/{identifier}")
+    public Response grantFileAccess(@PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
+        
+        DataverseRequest dataverseRequest;
+        DataFile dataFile;
+
+        try {
+            dataFile = findDataFileOrDie(fileToRequestAccessId);
+        } catch (WrappedResponse ex) {
+            List args = Arrays.asList(fileToRequestAccessId);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.fileNotFound", args));
+        }
+
+        RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(identifier);
+
+        if (ra == null) {
+            List args = Arrays.asList(identifier);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.grantAccess.noAssigneeFound", args));
+        }
+
+        try {
+            dataverseRequest = createDataverseRequest(findUserOrDie());
+        } catch (WrappedResponse wr) {
+            List args = Arrays.asList(identifier);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+        }
+
+        DataverseRole fileDownloaderRole = roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER);
+
+        try {
+            engineSvc.submit(new AssignRoleCommand(ra, fileDownloaderRole, dataFile, dataverseRequest, null));
+            if (dataFile.getFileAccessRequesters().remove(ra)) {
+                dataFileService.save(dataFile);
+            }
+
+        } catch (CommandException ex) {
+            List args = Arrays.asList(dataFile.getDisplayName(), ex.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.grantAccess.failure.commandError", args));
+        }
+
+        try {
+            AuthenticatedUser au = (AuthenticatedUser) ra;
+            userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.GRANTFILEACCESS, dataFile.getOwner().getId());
+        } catch (ClassCastException e) {
+            //nothing to do here - can only send a notification to an authenticated user
+        }
+
+        List args = Arrays.asList(dataFile.getDisplayName());
+        return ok(BundleUtil.getStringFromBundle("access.api.grantAccess.success.for.single.file", args));
+
+    }
+
+    /**
+     * Revoke Previously Granted Access to Restricted File
+     *
+     * @author sekmiller
+     *
+     * @param fileToRequestAccessId
+     * @param identifier
+     * @param apiToken
+     * @param headers
+     * @return
+     */
+    @DELETE
+    @Path("/datafile/{id}/revokeAccess/{identifier}")
+    public Response revokeFileAccess(@PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
+
+        DataverseRequest dataverseRequest;
+        DataFile dataFile;
+
+        try {
+            dataFile = findDataFileOrDie(fileToRequestAccessId);
+        } catch (WrappedResponse ex) {
+            List args = Arrays.asList(fileToRequestAccessId);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.fileNotFound", args));
+        }
+
+        try {
+            dataverseRequest = createDataverseRequest(findUserOrDie());
+        } catch (WrappedResponse wr) {
+            List args = Arrays.asList(wr.getLocalizedMessage());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+        }
+
+        if (identifier == null || identifier.equals("")) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.noKey"));
+        }
+
+        RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(identifier);
+        if (ra == null) {
+            List args = Arrays.asList(identifier);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.grantAccess.noAssigneeFound", args));
+        }
+
+        DataverseRole fileDownloaderRole = roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER);
+        TypedQuery query = em.createNamedQuery(
+                "RoleAssignment.listByAssigneeIdentifier_DefinitionPointId_RoleId",
+                RoleAssignment.class);
+        query.setParameter("assigneeIdentifier", ra.getIdentifier());
+        query.setParameter("definitionPointId", dataFile.getId());
+        query.setParameter("roleId", fileDownloaderRole.getId());
+        List roles = query.getResultList();
+
+        if (roles == null || roles.isEmpty()) {
+            List args = Arrays.asList(identifier);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.revokeAccess.noRoleFound", args));
+        }
+
+        try {
+            for (RoleAssignment role : roles) {
+                execCommand(new RevokeRoleCommand(role, dataverseRequest));
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        List args = Arrays.asList(ra.getIdentifier(), dataFile.getDisplayName());
+
+        return ok(BundleUtil.getStringFromBundle("access.api.revokeAccess.success.for.single.file", args));
+
+    }
+
+    /**
+     * Reject Access request to Restricted File
+     *
+     * @author sekmiller
+     *
+     * @param fileToRequestAccessId
+     * @param identifier
+     * @param apiToken
+     * @param headers
+     * @return
+     */
+    @PUT
+    @Path("/datafile/{id}/rejectAccess/{identifier}")
+    public Response rejectFileAccess(@PathParam("id") String fileToRequestAccessId, @PathParam("identifier") String identifier, @Context HttpHeaders headers) {
+
+        DataverseRequest dataverseRequest;
+        DataFile dataFile;
+
+        try {
+            dataFile = findDataFileOrDie(fileToRequestAccessId);
+        } catch (WrappedResponse ex) {
+            List args = Arrays.asList(fileToRequestAccessId);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.requestAccess.fileNotFound", args));
+        }
+
+        RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(identifier);
+
+        if (ra == null) {
+            List args = Arrays.asList(identifier);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.grantAccess.noAssigneeFound", args));
+        }
+
+        try {
+            dataverseRequest = createDataverseRequest(findUserOrDie());
+        } catch (WrappedResponse wr) {
+            List args = Arrays.asList(identifier);
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.failure.noUser", args));
+        }
+        
+        if (!(dataverseRequest.getAuthenticatedUser().isSuperuser() || permissionService.requestOn(dataverseRequest, dataFile.getOwner()).has(Permission.ManageDatasetPermissions))) {
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.rejectAccess.failure.noPermissions"));
+        }
+
+        if (dataFile.getFileAccessRequesters().contains(ra)) {
+            dataFile.getFileAccessRequesters().remove(ra);
+            dataFileService.save(dataFile);
+
+            try {
+                AuthenticatedUser au = (AuthenticatedUser) ra;
+                userNotificationService.sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.REJECTFILEACCESS, dataFile.getOwner().getId());
+            } catch (ClassCastException e) {
+                //nothing to do here - can only send a notification to an authenticated user
+            }
+
+            List args = Arrays.asList(dataFile.getDisplayName());
+            return ok(BundleUtil.getStringFromBundle("access.api.rejectAccess.success.for.single.file", args));
+
+        } else {
+            List args = Arrays.asList(dataFile.getDisplayName(), ra.getDisplayInfo().getTitle());
+            return error(BAD_REQUEST, BundleUtil.getStringFromBundle("access.api.fileAccess.rejectFailure.noRequest", args));
+        }
+    }
     
     // checkAuthorization is a convenience method; it calls the boolean method
     // isAccessAuthorized(), the actual workhorse, tand throws a 403 exception if not.
@@ -891,7 +1284,7 @@ private void checkAuthorization(DataFile df, String apiToken) throws WebApplicat
         }        
     }
     
-    
+
     
     private boolean isAccessAuthorized(DataFile df, String apiToken) {
     // First, check if the file belongs to a released Dataset version: 
@@ -971,7 +1364,7 @@ private boolean isAccessAuthorized(DataFile df, String apiToken) {
         }
         
         User user = null;
-       
+        
         /** 
          * Authentication/authorization:
          * 
@@ -1039,7 +1432,7 @@ private boolean isAccessAuthorized(DataFile df, String apiToken) {
                     return true;
                 }
             }
-            
+
             if (apiTokenUser != null) {
                 // used in an API context
                 if (permissionService.requestOn( createDataverseRequest(apiTokenUser), df.getOwner()).has(Permission.ViewUnpublishedDataset)) {
@@ -1047,7 +1440,7 @@ private boolean isAccessAuthorized(DataFile df, String apiToken) {
                     return true;
                 }
             }
-            
+
             // last option - guest user in either contexts
             // Guset user is impled by the code above.
             if ( permissionService.requestOn(dvRequestService.getDataverseRequest(), df.getOwner()).has(Permission.ViewUnpublishedDataset) ) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 89fe8a85213..39e41ebe228 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -8,6 +8,7 @@
 import edu.harvard.iq.dataverse.DataverseSession;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.EMailValidator;
+import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.GlobalId;
 import edu.harvard.iq.dataverse.UserServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
@@ -15,9 +16,12 @@
 import edu.harvard.iq.dataverse.api.dto.RoleDTO;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.UserIdentifier;
 import edu.harvard.iq.dataverse.authorization.exceptions.AuthenticationProviderFactoryNotFoundException;
 import edu.harvard.iq.dataverse.authorization.exceptions.AuthorizationSetupException;
+import edu.harvard.iq.dataverse.authorization.groups.Group;
+import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.AuthenticationProviderRow;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
@@ -76,8 +80,11 @@
 import edu.harvard.iq.dataverse.userdata.UserListResult;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
+
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.ResourceBundle;
 import javax.inject.Inject;
 import javax.persistence.Query;
@@ -108,6 +115,8 @@ public class Admin extends AbstractApiBean {
 	DataFileServiceBean fileService;
 	@EJB
 	DatasetServiceBean datasetService;
+    @EJB
+    GroupServiceBean groupService;
 
 	// Make the session available
 	@Inject
@@ -340,12 +349,12 @@ public Response filterAuthenticatedUsers(@QueryParam("searchTerm") String search
 			authUser = this.findUserOrDie();
 		} catch (AbstractApiBean.WrappedResponse ex) {
 			return error(Response.Status.FORBIDDEN,
-					ResourceBundle.getBundle("Bundle").getString("dashboard.list_users.api.auth.invalid_apikey"));
+					BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.invalid_apikey"));
 		}
 
 		if (!authUser.isSuperuser()) {
 			return error(Response.Status.FORBIDDEN,
-					ResourceBundle.getBundle("Bundle").getString("dashboard.list_users.api.auth.not_superuser"));
+					BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.not_superuser"));
 		}
 
 		UserListMaker userListMaker = new UserListMaker(userService);
@@ -988,6 +997,34 @@ public Response fixMissingOriginalTypes() {
 
 		return ok(info);
 	}
+        
+    @Path("datafiles/integrity/fixmissingoriginalsizes")
+    @GET
+    public Response fixMissingOriginalSizes(@QueryParam("limit") Integer limit) {
+        JsonObjectBuilder info = Json.createObjectBuilder();
+
+        List affectedFileIds = fileService.selectFilesWithMissingOriginalSizes();
+
+        if (affectedFileIds.isEmpty()) {
+            info.add("message",
+                    "All the tabular files in the database already have the original sizes set correctly; exiting.");
+        } else {
+            
+            int howmany = affectedFileIds.size();
+            String message = "Found " + howmany + " tabular files with missing original sizes. "; 
+            
+            if (limit == null || howmany <= limit) {
+                message = message.concat(" Kicking off an async job that will repair the files in the background.");
+            } else {
+                affectedFileIds.subList(limit, howmany-1).clear();
+                message = message.concat(" Kicking off an async job that will repair the " + limit + " files in the background.");                        
+            }
+            info.add("message", message);
+        }
+
+        ingestService.fixMissingOriginalSizes(affectedFileIds);
+        return ok(info);
+    }
 
 	/**
 	 * This method is used in API tests, called from UtilIt.java.
@@ -1048,7 +1085,7 @@ public Response reregisterHdlToPID(@PathParam("id") String id) {
         try {
             if (settingsSvc.get(SettingsServiceBean.Key.Protocol.toString()).equals(GlobalId.HDL_PROTOCOL)) {
                 logger.info("Bad Request protocol set to handle  " );
-                return error(Status.BAD_REQUEST, ResourceBundle.getBundle("Bundle").getString("admin.api.migrateHDL.failure.must.be.set.for.doi"));
+                return error(Status.BAD_REQUEST, BundleUtil.getStringFromBundle("admin.api.migrateHDL.failure.must.be.set.for.doi"));
             }
             
             User u = findUserOrDie();
@@ -1274,4 +1311,33 @@ public Response clearMetricsCacheByName(@PathParam("name") String name) {
 		return ok("metric cache " + name + " cleared.");
 	}
 
+    @GET
+    @Path("/dataverse/{alias}/addRoleAssignmentsToChildren")
+    public Response addRoleAssignementsToChildren(@PathParam("alias") String alias) throws WrappedResponse {
+        Dataverse owner = dataverseSvc.findByAlias(alias);
+        if (owner == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = findAuthenticatedUserOrDie();
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        boolean inheritAllRoles = false;
+        String rolesString = settingsSvc.getValueForKey(SettingsServiceBean.Key.InheritParentRoleAssignments, "");
+        if (rolesString.length() > 0) {
+            ArrayList rolesToInherit = new ArrayList(Arrays.asList(rolesString.split("\\s*,\\s*")));
+            if (!rolesToInherit.isEmpty()) {
+                if (rolesToInherit.contains("*")) {
+                    inheritAllRoles = true;
+                }
+                return ok(dataverseSvc.addRoleAssignmentsToChildren(owner, rolesToInherit, inheritAllRoles));
+            }
+        }
+        return error(Response.Status.BAD_REQUEST,
+                "InheritParentRoleAssignments does not list any roles on this instance");
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java b/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java
index 2095161fc52..a33d3ee1ea6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DatasetFieldServiceApi.java
@@ -55,6 +55,8 @@ public class DatasetFieldServiceApi extends AbstractApiBean {
     @EJB
     ControlledVocabularyValueServiceBean controlledVocabularyValueService;
 
+    private static final Logger logger = Logger.getLogger(DatasetFieldServiceApi.class.getName());
+    
     @GET
     public Response getAll() {
         try {
@@ -132,6 +134,15 @@ public Response getByName(@PathParam("name") String name) {
                 parentAllowsMultiplesBoolean = parent.isAllowMultiples();
                 parentAllowsMultiplesDisplay = Boolean.toString(parentAllowsMultiplesBoolean);
             }
+            JsonArrayBuilder controlledVocabularyValues = Json.createArrayBuilder();
+            for (ControlledVocabularyValue controlledVocabularyValue : dsf.getControlledVocabularyValues()) {
+                controlledVocabularyValues.add(NullSafeJsonBuilder.jsonObjectBuilder()
+                        .add("id", controlledVocabularyValue.getId())
+                        .add("strValue", controlledVocabularyValue.getStrValue())
+                        .add("displayOrder", controlledVocabularyValue.getDisplayOrder())
+                        .add("identifier", controlledVocabularyValue.getIdentifier())
+                );
+            }
             return ok(NullSafeJsonBuilder.jsonObjectBuilder()
                     .add("name", dsf.getName())
                     .add("id", id )
@@ -140,6 +151,7 @@ public Response getByName(@PathParam("name") String name) {
                     .add("fieldType", fieldType.name())
                     .add("allowsMultiples", allowsMultiples)
                     .add("hasParent", hasParent)
+                    .add("controlledVocabularyValues", controlledVocabularyValues)
                     .add("parentAllowsMultiples", parentAllowsMultiplesDisplay)
                     .add("solrFieldSearchable", solrFieldSearchable)
                     .add("solrFieldFacetable", solrFieldFacetable)
@@ -277,7 +289,7 @@ public Response loadDatasetFields(File file) {
             return error(Status.EXPECTATION_FAILED, "File not found");
             
         } catch (Exception e) {
-            Logger.getLogger(DatasetFieldServiceApi.class.getName()).log(Level.WARNING, "Error parsing dataset fields:" + e.getMessage(), e);
+            logger.log(Level.WARNING, "Error parsing dataset fields:" + e.getMessage(), e);
             alr.setActionResult(ActionLogRecord.Result.InternalError);
             alr.setInfo( alr.getInfo() + "// " + e.getMessage());
             return error(Status.INTERNAL_SERVER_ERROR, e.getMessage());
@@ -287,8 +299,7 @@ public Response loadDatasetFields(File file) {
                 try {
                     br.close();
                 } catch (IOException e) {
-                    Logger.getLogger(DatasetFieldServiceApi.class.getName())
-                            .log(Level.WARNING, "Error closing the reader while importing Dataset Fields.");
+                    logger.log(Level.WARNING, "Error closing the reader while importing Dataset Fields.");
                 }
             }
             actionLogSvc.log(alr);
@@ -308,6 +319,9 @@ private String parseMetadataBlock(String[] values) {
             mdb.setOwner(dataverseService.findByAlias(values[2]));
         }
         mdb.setDisplayName(values[3]);
+        if (values.length>4 && !StringUtils.isEmpty(values[4])) {
+            mdb.setNamespaceUri(values[4]);
+        }
 
         metadataBlockService.save(mdb);
         return mdb.getName();
@@ -337,8 +351,13 @@ private String parseDatasetField(String[] values) {
         dsf.setRequired(Boolean.parseBoolean(values[13]));
         if (!StringUtils.isEmpty(values[14])) {
             dsf.setParentDatasetFieldType(datasetFieldService.findByName(values[14]));
+        } else {
+            dsf.setParentDatasetFieldType(null);
         }
         dsf.setMetadataBlock(dataverseService.findMDBByName(values[15]));
+        if(values.length>16 && !StringUtils.isEmpty(values[16])) {
+          dsf.setUri(values[16]);
+        }
         datasetFieldService.save(dsf);
         return dsf.getName();
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
index 69a346080bd..4f868d90ae7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
@@ -21,7 +21,6 @@
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.UserNotification;
 import edu.harvard.iq.dataverse.UserNotificationServiceBean;
-import static edu.harvard.iq.dataverse.api.AbstractApiBean.error;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -75,9 +74,10 @@
 import edu.harvard.iq.dataverse.privateurl.PrivateUrl;
 import edu.harvard.iq.dataverse.S3PackageImporter;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateDvObjectPIDMetadataCommand;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.EjbUtil;
-import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
@@ -87,6 +87,7 @@
 import java.io.StringReader;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -94,7 +95,6 @@
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
@@ -177,7 +177,7 @@ private interface DsVersionHandler {
         T handleSpecific( long major, long minor );
         T handleLatestPublished();
     }
-	
+    
     @GET
     @Path("{id}")
     public Response getDataset(@PathParam("id") String id) {
@@ -209,25 +209,12 @@ public Response exportDataset(@QueryParam("persistentId") String persistentId, @
             
             ExportService instance = ExportService.getInstance(settingsSvc);
             
-            String xml = instance.getExportAsString(dataset, exporter);
-            // I'm wondering if this going to become a performance problem 
-            // with really GIANT datasets,
-            // the fact that we are passing these exports, blobs of JSON, and, 
-            // especially, DDI XML as complete strings. It would be nicer 
-            // if we could stream instead - and the export service already can
-            // give it to as as a stream; then we could start sending the 
-            // output to the remote client as soon as we got the first bytes, 
-            // without waiting for the whole thing to be generated and buffered... 
-            // (the way Access API streams its output). 
-            // -- L.A., 4.5
+            InputStream is = instance.getExport(dataset, exporter);
+           
+            String mediaType = instance.getMediaType(exporter);
             
-            String mediaType = MediaType.TEXT_PLAIN;//PM - output formats appear to be either JSON or XML, unclear why text/plain is being used as default content-type.
-
-            if (instance.isXMLFormat(exporter)){
-                mediaType = MediaType.APPLICATION_XML;
-            }
             return allowCors(Response.ok()
-                    .entity(xml)
+                    .entity(is)
                     .type(mediaType).
                     build());
         } catch (Exception wr) {
@@ -235,37 +222,37 @@ public Response exportDataset(@QueryParam("persistentId") String persistentId, @
         }
     }
 
-	@DELETE
-	@Path("{id}")
-	public Response deleteDataset( @PathParam("id") String id) {
-		return response( req -> {
-			execCommand( new DeleteDatasetCommand(req, findDatasetOrDie(id)));
-			return ok("Dataset " + id + " deleted");
+    @DELETE
+    @Path("{id}")
+    public Response deleteDataset( @PathParam("id") String id) {
+        return response( req -> {
+            execCommand( new DeleteDatasetCommand(req, findDatasetOrDie(id)));
+            return ok("Dataset " + id + " deleted");
         });
-	}
+    }
         
-	@DELETE
-	@Path("{id}/destroy")
-	public Response destroyDataset( @PathParam("id") String id) {
-		return response( req -> {
-			execCommand( new DestroyDatasetCommand(findDatasetOrDie(id), req) );
-			return ok("Dataset " + id + " destroyed");
+    @DELETE
+    @Path("{id}/destroy")
+    public Response destroyDataset( @PathParam("id") String id) {
+        return response( req -> {
+            execCommand( new DestroyDatasetCommand(findDatasetOrDie(id), req) );
+            return ok("Dataset " + id + " destroyed");
         });
-	}
+    }
         
         @DELETE
-	@Path("{datasetId}/deleteLink/{linkedDataverseId}")
-	public Response deleteDatasetLinkingDataverse( @PathParam("datasetId") String datasetId, @PathParam("linkedDataverseId") String linkedDataverseId) {
+    @Path("{datasetId}/deleteLink/{linkedDataverseId}")
+    public Response deleteDatasetLinkingDataverse( @PathParam("datasetId") String datasetId, @PathParam("linkedDataverseId") String linkedDataverseId) {
                 boolean index = true;
-		return response(req -> {
-			execCommand(new DeleteDatasetLinkingDataverseCommand(req, findDatasetOrDie(datasetId), findDatasetLinkingDataverseOrDie(datasetId, linkedDataverseId), index));
-			return ok("Link from Dataset " + datasetId + " to linked Dataverse " + linkedDataverseId + " deleted");
+        return response(req -> {
+            execCommand(new DeleteDatasetLinkingDataverseCommand(req, findDatasetOrDie(datasetId), findDatasetLinkingDataverseOrDie(datasetId, linkedDataverseId), index));
+            return ok("Link from Dataset " + datasetId + " to linked Dataverse " + linkedDataverseId + " deleted");
         });
-	}
+    }
         
-	@PUT
-	@Path("{id}/citationdate")
-	public Response setCitationDate( @PathParam("id") String id, String dsfTypeName) {
+    @PUT
+    @Path("{id}/citationdate")
+    public Response setCitationDate( @PathParam("id") String id, String dsfTypeName) {
         return response( req -> {
             if ( dsfTypeName.trim().isEmpty() ){
                 return badRequest("Please provide a dataset field type in the requst body.");
@@ -281,19 +268,19 @@ public Response setCitationDate( @PathParam("id") String id, String dsfTypeName)
             execCommand(new SetDatasetCitationDateCommand(req, findDatasetOrDie(id), dsfType));
             return ok("Citation Date for dataset " + id + " set to: " + (dsfType != null ? dsfType.getDisplayName() : "default"));
         });
-	}    
+    }    
     
-	@DELETE
-	@Path("{id}/citationdate")
-	public Response useDefaultCitationDate( @PathParam("id") String id) {
+    @DELETE
+    @Path("{id}/citationdate")
+    public Response useDefaultCitationDate( @PathParam("id") String id) {
         return response( req -> {
             execCommand(new SetDatasetCitationDateCommand(req, findDatasetOrDie(id), null));
             return ok("Citation Date for dataset " + id + " set to default");
         });
-	}         
-	
-	@GET
-	@Path("{id}/versions")
+    }         
+    
+    @GET
+    @Path("{id}/versions")
     public Response listVersions( @PathParam("id") String id ) {
         return allowCors(response( req -> 
              ok( execCommand( new ListVersionsCommand(req, findDatasetOrDie(id)) )
@@ -301,9 +288,9 @@ public Response listVersions( @PathParam("id") String id ) {
                                 .map( d -> json(d) )
                                 .collect(toJsonArray()))));
     }
-	
-	@GET
-	@Path("{id}/versions/{versionId}")
+    
+    @GET
+    @Path("{id}/versions/{versionId}")
     public Response getVersion( @PathParam("id") String datasetId, @PathParam("versionId") String versionId) {
         return allowCors(response( req -> {
             DatasetVersion dsv = getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId));            
@@ -311,9 +298,9 @@ public Response getVersion( @PathParam("id") String datasetId, @PathParam("versi
                                                         : ok(json(dsv));
         }));
     }
-	
+    
     @GET
-	@Path("{id}/versions/{versionId}/files")
+    @Path("{id}/versions/{versionId}/files")
     public Response getVersionFiles( @PathParam("id") String datasetId, @PathParam("versionId") String versionId) {
         return allowCors(response( req -> ok( jsonFileMetadatas(
                          getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId)).getFileMetadatas()))));
@@ -322,18 +309,18 @@ public Response getVersionFiles( @PathParam("id") String datasetId, @PathParam("
     @GET
     @Path("{id}/versions/{versionId}/metadata")
     public Response getVersionMetadata( @PathParam("id") String datasetId, @PathParam("versionId") String versionId) {
-		return allowCors(response( req -> ok(
+        return allowCors(response( req -> ok(
                     jsonByBlocks(
                         getDatasetVersionOrDie(req, versionId, findDatasetOrDie(datasetId) )
                                 .getDatasetFields()))));
     }
     
     @GET
-	@Path("{id}/versions/{versionNumber}/metadata/{block}")
+    @Path("{id}/versions/{versionNumber}/metadata/{block}")
     public Response getVersionMetadataBlock( @PathParam("id") String datasetId, 
                                              @PathParam("versionNumber") String versionNumber, 
                                              @PathParam("block") String blockName ) {
-		
+        
         return allowCors(response( req -> {
             DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId) );
             
@@ -346,10 +333,10 @@ public Response getVersionMetadataBlock( @PathParam("id") String datasetId,
             return notFound("metadata block named " + blockName + " not found");
         }));
     }
-	
+    
     @DELETE
-	@Path("{id}/versions/{versionId}")
-	public Response deleteDraftVersion( @PathParam("id") String id,  @PathParam("versionId") String versionId ){
+    @Path("{id}/versions/{versionId}")
+    public Response deleteDraftVersion( @PathParam("id") String id,  @PathParam("versionId") String versionId ){
         if ( ! ":draft".equals(versionId) ) {
             return badRequest("Only the :draft version can be deleted");
         }
@@ -370,7 +357,7 @@ public Response updateDatasetTargetURL(@PathParam("id") String id ) {
         });
     }
     
-    @GET
+    @POST
     @Path("/modifyRegistrationAll")
     public Response updateDatasetTargetURLAll() {
         return response( req -> {
@@ -384,6 +371,41 @@ public Response updateDatasetTargetURLAll() {
             return ok("Update All Dataset target url completed");
         });
     }
+    
+    @POST
+    @Path("{id}/modifyRegistrationMetadata")
+    public Response updateDatasetPIDMetadata(@PathParam("id") String id) {
+
+        try {
+            Dataset dataset = findDatasetOrDie(id);
+            if (!dataset.isReleased()) {
+                return error(Response.Status.BAD_REQUEST, BundleUtil.getStringFromBundle("datasets.api.updatePIDMetadata.failure.dataset.must.be.released"));
+            }
+        } catch (WrappedResponse ex) {
+            Logger.getLogger(Datasets.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+        return response(req -> {
+            execCommand(new UpdateDvObjectPIDMetadataCommand(findDatasetOrDie(id), req));
+            List args = Arrays.asList(id);
+            return ok(BundleUtil.getStringFromBundle("datasets.api.updatePIDMetadata.success.for.single.dataset", args));
+        });
+    }
+    
+    @GET
+    @Path("/modifyRegistrationPIDMetadataAll")
+    public Response updateDatasetPIDMetadataAll() {
+        return response( req -> {
+            datasetService.findAll().forEach( ds -> {
+                try {
+                    execCommand(new UpdateDvObjectPIDMetadataCommand(findDatasetOrDie(ds.getId().toString()), req));
+                } catch (WrappedResponse ex) {
+                    Logger.getLogger(Datasets.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            });           
+            return ok(BundleUtil.getStringFromBundle("datasets.api.updatePIDMetadata.success.for.update.all"));
+        });
+    }
   
     @PUT
     @Path("{id}/versions/{versionId}")
@@ -464,9 +486,9 @@ private Response processDatasetFieldDataDelete(String jsonBody, String id, Datav
 
             dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
 
-            List controlledVocabularyItemsToRemove = new ArrayList();
-            List datasetFieldValueItemsToRemove = new ArrayList();
-            List datasetFieldCompoundValueItemsToRemove = new ArrayList();
+            List controlledVocabularyItemsToRemove = new ArrayList();
+            List datasetFieldValueItemsToRemove = new ArrayList();
+            List datasetFieldCompoundValueItemsToRemove = new ArrayList();
 
             for (DatasetField updateField : fields) {
                 boolean found = false;
@@ -643,8 +665,8 @@ private Response processDatasetUpdate(String jsonBody, String id, DataverseReque
                         if (dsf.isEmpty() || dsf.getDatasetFieldType().isAllowMultiples() || replaceData ) {
                             if(replaceData){
                                 if(dsf.getDatasetFieldType().isAllowMultiples()){
-                                    dsf.setDatasetFieldCompoundValues(new ArrayList());
-                                    dsf.setDatasetFieldValues(new ArrayList());
+                                    dsf.setDatasetFieldCompoundValues(new ArrayList());
+                                    dsf.setDatasetFieldValues(new ArrayList());
                                     dsf.getControlledVocabularyValues().clear();
                                 } else {
                                     dsf.setSingleValue("");
@@ -954,12 +976,16 @@ public Response getDatasetThumbnailCandidates(@PathParam("id") String idSupplied
     @GET
     @Produces({"image/png"})
     @Path("{id}/thumbnail")
-    public InputStream getDatasetThumbnail(@PathParam("id") String idSupplied) {
+    public Response getDatasetThumbnail(@PathParam("id") String idSupplied) {
         try {
             Dataset dataset = findDatasetOrDie(idSupplied);
-            return DatasetUtil.getThumbnailAsInputStream(dataset);
-        } catch (WrappedResponse ex) {
-            return null;
+            InputStream is = DatasetUtil.getThumbnailAsInputStream(dataset);
+            if(is == null) {
+                return notFound("Thumbnail not available");
+            }
+            return Response.ok(is).build();
+        } catch (WrappedResponse wr) {
+            return notFound("Thumbnail not available");
         }
     }
 
@@ -1002,7 +1028,7 @@ public Response removeDatasetLogo(@PathParam("id") String idSupplied) {
     @GET
     @Path("{identifier}/dataCaptureModule/rsync")
     public Response getRsync(@PathParam("identifier") String id) {
-	    //TODO - does it make sense to switch this to dataset identifier for consistency with the rest of the DCM APIs?
+        //TODO - does it make sense to switch this to dataset identifier for consistency with the rest of the DCM APIs?
         if (!DataCaptureModuleUtil.rsyncSupportEnabled(settingsSvc.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
             return error(Response.Status.METHOD_NOT_ALLOWED, SettingsServiceBean.Key.UploadMethods + " does not contain " + SystemConfig.FileUploadMethods.RSYNC + ".");
         }
@@ -1211,7 +1237,10 @@ public Response addFileToDataset(@PathParam("id") String idSupplied,
                     @FormDataParam("file") final FormDataBodyPart formDataBodyPart
                     ){
 
-          
+        if (!systemConfig.isHTTPUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
+        }
+
         // -------------------------------------
         // (1) Get the user from the API key
         // -------------------------------------
@@ -1220,16 +1249,9 @@ public Response addFileToDataset(@PathParam("id") String idSupplied,
             authUser = findUserOrDie();
         } catch (WrappedResponse ex) {
             return error(Response.Status.FORBIDDEN,
-                    ResourceBundle.getBundle("Bundle").getString("file.addreplace.error.auth")
+                    BundleUtil.getStringFromBundle("file.addreplace.error.auth")
                     );
         }
-        //---------------------------------------
-        // (1A) Make sure that the upload type is not rsync
-        // ------------------------------------- 
-        
-        if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsSvc.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
-            return error(Response.Status.METHOD_NOT_ALLOWED, SettingsServiceBean.Key.UploadMethods + " contains " + SystemConfig.FileUploadMethods.RSYNC + ". Please use rsync file upload.");
-        }
         
         
         // -------------------------------------
@@ -1238,14 +1260,26 @@ public Response addFileToDataset(@PathParam("id") String idSupplied,
         // -------------------------------------
         Dataset dataset;
         
-        Long datasetId;
         try {
             dataset = findDatasetOrDie(idSupplied);
         } catch (WrappedResponse wr) {
             return wr.getResponse();           
         }
         
-               
+        //------------------------------------
+        // (2a) Make sure dataset does not have package file
+        //
+        // --------------------------------------
+        
+        for (DatasetVersion dv : dataset.getVersions()) {
+            if (dv.isHasPackageFile()) {
+                return error(Response.Status.FORBIDDEN,
+                        ResourceBundle.getBundle("Bundle").getString("file.api.alreadyHasPackageFile")
+                );
+            }
+        }
+
+                       
         // -------------------------------------
         // (3) Get the file name and content type
         // -------------------------------------
@@ -1293,7 +1327,7 @@ public Response addFileToDataset(@PathParam("id") String idSupplied,
         if (addFileHelper.hasError()){
             return error(addFileHelper.getHttpErrorCode(), addFileHelper.getErrorMessagesAsString("\n"));
         }else{
-            String successMsg = ResourceBundle.getBundle("Bundle").getString("file.addreplace.success.add");        
+            String successMsg = BundleUtil.getStringFromBundle("file.addreplace.success.add");
             try {
                 //msgt("as String: " + addFileHelper.getSuccessResult());
                 /**
@@ -1332,10 +1366,10 @@ private void msgt(String m){
     private  T handleVersion( String versionId, DsVersionHandler hdl )
         throws WrappedResponse {
         switch (versionId) {
-			case ":latest": return hdl.handleLatest();
-			case ":draft": return hdl.handleDraft();
+            case ":latest": return hdl.handleLatest();
+            case ":draft": return hdl.handleDraft();
             case ":latest-published": return hdl.handleLatestPublished();
-			default:
+            default:
                 try {
                     String[] versions = versionId.split("\\.");
                     switch (versions.length) {
@@ -1349,7 +1383,7 @@ private  T handleVersion( String versionId, DsVersionHandler hdl )
                 } catch ( NumberFormatException nfe ) {
                     throw new WrappedResponse( error( Response.Status.BAD_REQUEST, "Illegal version identifier '" + versionId + "'") );
                 }
-		}
+        }
     }
     
     private DatasetVersion getDatasetVersionOrDie( final DataverseRequest req, String versionNumber, final Dataset ds ) throws WrappedResponse {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index 52587d692d7..094ffbc06b2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -7,6 +7,7 @@
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseFacet;
 import edu.harvard.iq.dataverse.DataverseContact;
+import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.GlobalId;
@@ -16,6 +17,8 @@
 import edu.harvard.iq.dataverse.api.dto.ExplicitGroupDTO;
 import edu.harvard.iq.dataverse.api.dto.RoleAssignmentDTO;
 import edu.harvard.iq.dataverse.api.dto.RoleDTO;
+import edu.harvard.iq.dataverse.api.imports.ImportException;
+import edu.harvard.iq.dataverse.api.imports.ImportServiceBean;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroup;
@@ -50,6 +53,7 @@
 import edu.harvard.iq.dataverse.engine.command.impl.RemoveRoleAssigneesFromExplicitGroupCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RevokeRoleCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseDefaultContributorRoleCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseMetadataBlocksCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateExplicitGroupCommand;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
@@ -93,8 +97,10 @@
 import javax.ws.rs.core.Response.Status;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.toJsonArray;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Optional;
+import javax.persistence.NoResultException;
 
 /**
  * A REST API for dataverses.
@@ -109,8 +115,9 @@ public class Dataverses extends AbstractApiBean {
 
     @EJB
     ExplicitGroupServiceBean explicitGroupSvc;
-//    @EJB
-//    SystemConfig systemConfig;
+
+    @EJB
+    ImportServiceBean importService;
 
     @POST
     public Response addRoot(String body) {
@@ -303,6 +310,74 @@ public Response importDataset(String jsonBody, @PathParam("identifier") String p
         }
     }
 
+    // TODO decide if I merge importddi with import just below (xml and json on same api, instead of 2 api)
+    @POST
+    @Path("{identifier}/datasets/:importddi")
+    public Response importDatasetDdi(String xml, @PathParam("identifier") String parentIdtf, @QueryParam("pid") String pidParam, @QueryParam("release") String releaseParam) throws ImportException {
+        try {
+            User u = findUserOrDie();
+            if (!u.isSuperuser()) {
+                return error(Status.FORBIDDEN, "Not a superuser");
+            }
+            Dataverse owner = findDataverseOrDie(parentIdtf);
+            Dataset ds = null;
+            try {
+                ds = jsonParser().parseDataset(importService.ddiToJson(xml));
+            }
+            catch (JsonParseException jpe) {
+                return badRequest("Error parsing datas as Json: "+jpe.getMessage());
+            }
+            ds.setOwner(owner);
+            if (nonEmpty(pidParam)) {
+                if (!GlobalId.verifyImportCharacters(pidParam)) {
+                    return badRequest("PID parameter contains characters that are not allowed by the Dataverse application. On import, the PID must only contain characters specified in this regex: " + BundleUtil.getStringFromBundle("pid.allowedCharacters"));
+                }
+                Optional maybePid = GlobalId.parse(pidParam);
+                if (maybePid.isPresent()) {
+                    ds.setGlobalId(maybePid.get());
+                } else {
+                    // unparsable PID passed. Terminate.
+                    return badRequest("Cannot parse the PID parameter '" + pidParam + "'. Make sure it is in valid form - see Dataverse Native API documentation.");
+                }
+            }
+
+            boolean shouldRelease = StringUtil.isTrue(releaseParam);
+            DataverseRequest request = createDataverseRequest(u);
+
+            Dataset managedDs = null;
+            if (nonEmpty(pidParam)) {
+                managedDs = execCommand(new ImportDatasetCommand(ds, request));
+            }
+            else {
+                managedDs = execCommand(new CreateNewDatasetCommand(ds, request));
+            }
+
+            JsonObjectBuilder responseBld = Json.createObjectBuilder()
+                    .add("id", managedDs.getId())
+                    .add("persistentId", managedDs.getGlobalIdString());
+
+            if (shouldRelease) {
+                DatasetVersion latestVersion = ds.getLatestVersion();
+                latestVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+                latestVersion.setVersionNumber(1l);
+                latestVersion.setMinorVersionNumber(0l);
+                if (latestVersion.getCreateTime() != null) {
+                    latestVersion.setCreateTime(new Date());
+                }
+                if (latestVersion.getLastUpdateTime() != null) {
+                    latestVersion.setLastUpdateTime(new Date());
+                }
+                PublishDatasetResult res = execCommand(new PublishDatasetCommand(managedDs, request, false, shouldRelease));
+                responseBld.add("releaseCompleted", res.isCompleted());
+            }
+
+            return created("/datasets/" + managedDs.getId(), responseBld);
+
+        } catch (WrappedResponse ex) {
+            return ex.getResponse();
+        }
+    }
+
     private Dataset parseDataset(String datasetJson) throws WrappedResponse {
         try (StringReader rdr = new StringReader(datasetJson)) {
             return jsonParser().parseDataset(Json.createReader(rdr).readObject());
@@ -480,16 +555,14 @@ public Response setFacets(@PathParam("identifier") String dvIdtf, String facetId
     }
 
     // FIXME: This listContent method is way too optimistic, always returning "ok" and never "error".
-    // FIXME: This listContent method should be reformatted. The indentation and whitespace is odd.
-    // FIXME: This method is too slow with lots of data: https://github.com/IQSS/dataverse/issues/2122
     // TODO: Investigate why there was a change in the timeframe of when pull request #4350 was merged
     // (2438-4295-dois-for-files branch) such that a contributor API token no longer allows this method
     // to be called without a PermissionException being thrown.
     @GET
     @Path("{identifier}/contents")
-    public Response listContent(@PathParam("identifier") String dvIdtf) {
-        DvObject.Visitor ser = new DvObject.Visitor() {
+    public Response listContent(@PathParam("identifier") String dvIdtf) throws WrappedResponse {
 
+        DvObject.Visitor ser = new DvObject.Visitor() {
             @Override
             public JsonObjectBuilder visit(Dataverse dv) {
                 return Json.createObjectBuilder().add("type", "dataverse")
@@ -743,6 +816,52 @@ public Response updateGroup(ExplicitGroupDTO groupDto,
                 new UpdateExplicitGroupCommand(req,
                         groupDto.apply(findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner)))))));
     }
+    
+    @PUT
+    @Path("{identifier}/defaultContributorRole/{roleAlias}")
+    public Response updateDefaultContributorRole(
+            @PathParam("identifier") String dvIdtf,
+            @PathParam("roleAlias") String roleAlias) {
+
+        DataverseRole defaultRole;
+        
+        if (roleAlias.equals(DataverseRole.NONE)) {
+            defaultRole = null;
+        } else {
+            try {
+                Dataverse dv = findDataverseOrDie(dvIdtf);
+                defaultRole = rolesSvc.findCustomRoleByAliasAndOwner(roleAlias, dv.getId());
+            } catch (Exception nre) {
+                List args = Arrays.asList(roleAlias);
+                String retStringError = BundleUtil.getStringFromBundle("dataverses.api.update.default.contributor.role.failure.role.not.found", args);
+                return error(Status.NOT_FOUND, retStringError);
+            }
+
+            if (!defaultRole.doesDvObjectClassHavePermissionForObject(Dataset.class)) {
+                List args = Arrays.asList(roleAlias);
+                String retStringError = BundleUtil.getStringFromBundle("dataverses.api.update.default.contributor.role.failure.role.does.not.have.dataset.permissions", args);
+                return error(Status.BAD_REQUEST, retStringError);
+            }
+
+        }
+
+        try {
+            Dataverse dv = findDataverseOrDie(dvIdtf);
+            
+            String defaultRoleName = defaultRole == null ? BundleUtil.getStringFromBundle("permission.default.contributor.role.none.name") : defaultRole.getName();
+
+            return response(req -> {
+                execCommand(new UpdateDataverseDefaultContributorRoleCommand(defaultRole, req, dv));
+                List args = Arrays.asList(dv.getDisplayName(), defaultRoleName);
+                String retString = BundleUtil.getStringFromBundle("dataverses.api.update.default.contributor.role.success", args);
+                return ok(retString);
+            });
+
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+    }
 
     @DELETE
     @Path("{identifier}/groups/{aliasInOwner}")
@@ -763,7 +882,7 @@ public Response addRoleAssingees(List roleAssingeeIdentifiers,
             @PathParam("aliasInOwner") String grpAliasInOwner) {
         return response(req -> ok(
                 json(
-                        execCommand(
+                    execCommand(
                                 new AddRoleAssigneesToExplicitGroupCommand(req,
                                         findExplicitGroupOrDie(findDataverseOrDie(dvIdtf), req, grpAliasInOwner),
                                         new TreeSet<>(roleAssingeeIdentifiers))))));
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java
index fe0e98487b7..6081137df56 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstance.java
@@ -93,13 +93,22 @@ public Boolean checkIfServiceSupportedAndSetConverter(String serviceArg, String
 
         for (OptionalAccessService dataService : servicesAvailable) {
             if (dataService != null) {
-                // Special case for the subsetting parameter (variables=):
                 if (serviceArg.equals("variables")) {
+                    // Special case for the subsetting parameter (variables=):
                     if ("subset".equals(dataService.getServiceName())) {
                         conversionParam = "subset";
                         conversionParamValue = serviceArgValue; 
                         return true; 
                     }
+                } else if (serviceArg.equals("noVarHeader")) {
+                    // Another special case available for tabular ("subsettable") data files - 
+                    // "do not add variable header" flag:
+                    if ("true".equalsIgnoreCase(serviceArgValue) || "1".equalsIgnoreCase(serviceArgValue)) {
+                        if ("subset".equals(dataService.getServiceName())) {
+                            this.conversionParam = serviceArg;
+                            return true;
+                        }
+                    }
                 } else if ("imageThumb".equals(serviceArg)) {
                     if ("true".equals(serviceArgValue)) {
                         this.conversionParam = serviceArg;
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
index fab2538832e..399e9a081df 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java
@@ -33,6 +33,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.RedirectionException;
@@ -75,6 +76,7 @@ public void writeTo(DownloadInstance di, Class clazz, Type type, Annotation[]
                     storageIO.open();
                 } catch (IOException ioex) {
                     //throw new WebApplicationException(Response.Status.SERVICE_UNAVAILABLE);
+                    logger.log(Level.INFO, "Datafile {0}: Failed to locate and/or open physical file. Error message: {1}", new Object[]{dataFile.getId(), ioex.getLocalizedMessage()});
                     throw new NotFoundException("Datafile "+dataFile.getId()+": Failed to locate and/or open physical file.");
                 }
                 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Files.java b/src/main/java/edu/harvard/iq/dataverse/api/Files.java
index 8f77b6a21fc..d226e03145d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Files.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Files.java
@@ -157,7 +157,10 @@ public Response replaceFileInDataset(
                     @FormDataParam("file") FormDataContentDisposition contentDispositionHeader,
                     @FormDataParam("file") final FormDataBodyPart formDataBodyPart
                     ){
-        
+
+        if (!systemConfig.isHTTPUpload()) {
+            return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
+        }
         // -------------------------------------
         // (1) Get the user from the API key
         // -------------------------------------
@@ -166,7 +169,7 @@ public Response replaceFileInDataset(
             authUser = findUserOrDie();
         } catch (AbstractApiBean.WrappedResponse ex) {
             return error(Response.Status.FORBIDDEN, 
-                    ResourceBundle.getBundle("Bundle").getString("file.addreplace.error.auth")
+                    BundleUtil.getStringFromBundle("file.addreplace.error.auth")
                     );
         }
 
@@ -228,6 +231,10 @@ public Response replaceFileInDataset(
         try {
             DataFile dataFile = findDataFileOrDie(fileIdOrPersistentId);
             fileToReplaceId = dataFile.getId();
+            
+            if (dataFile.isFilePackage()) {                           
+                return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile"));
+            }
         } catch (WrappedResponse ex) {
             String error = BundleUtil.getStringFromBundle("file.addreplace.error.existing_file_to_replace_not_found_by_id", Arrays.asList(fileIdOrPersistentId));
             // TODO: Some day, return ex.getResponse() instead. Also run FilesIT and updated expected status code and message.
@@ -254,7 +261,7 @@ public Response replaceFileInDataset(
         
         }else{
             msg("no error");
-            String successMsg = ResourceBundle.getBundle("Bundle").getString("file.addreplace.success.replace");        
+            String successMsg = BundleUtil.getStringFromBundle("file.addreplace.success.replace");
 
             try {
                 msgt("as String: " + addFileHelper.getSuccessResult());
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java b/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java
index bf5964d44ef..cb28d1fae49 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/HarvestingServer.java
@@ -19,6 +19,7 @@
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClientServiceBean;
 import edu.harvard.iq.dataverse.harvest.server.OAISet;
 import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
@@ -130,7 +131,7 @@ public Response createOaiSet(String jsonBody, @PathParam("specname") String spec
             return wr.getResponse();
         }
         if (!dvUser.isSuperuser()) {            
-            return badRequest(ResourceBundle.getBundle("Bundle").getString("harvestserver.newSetDialog.setspec.superUser.required"));
+            return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.superUser.required"));
         }
 
         StringReader rdr = new StringReader(jsonBody);
@@ -143,18 +144,18 @@ public Response createOaiSet(String jsonBody, @PathParam("specname") String spec
 		//Validating spec 
 		if (!StringUtils.isEmpty(spec)) {
 			if (spec.length() > 30) {
-				return badRequest(ResourceBundle.getBundle("Bundle").getString("harvestserver.newSetDialog.setspec.sizelimit"));
+				return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.sizelimit"));
 			}
 			if (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", spec)) {
-				return badRequest(ResourceBundle.getBundle("Bundle").getString("harvestserver.newSetDialog.setspec.invalid"));
+				return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.invalid"));
 				// If it passes the regex test, check 
 			}
 			if (oaiSetService.findBySpec(spec) != null) {
-				return badRequest(ResourceBundle.getBundle("Bundle").getString("harvestserver.newSetDialog.setspec.alreadyused"));
+				return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.alreadyused"));
 			}
 
 		} else {
-			return badRequest(ResourceBundle.getBundle("Bundle").getString("harvestserver.newSetDialog.setspec.required"));
+			return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
 		}
 		set.setSpec(spec);
 		String name, desc, defn;
@@ -162,7 +163,7 @@ public Response createOaiSet(String jsonBody, @PathParam("specname") String spec
 		try {
 			name = json.getString("name");
 		} catch (NullPointerException npe_name) {
-			return badRequest(ResourceBundle.getBundle("Bundle").getString("harvestserver.newSetDialog.setspec.required"));
+			return badRequest(BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"));
 		}
 		try {
 			defn = json.getString("definition");
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Index.java b/src/main/java/edu/harvard/iq/dataverse/api/Index.java
index 8f2d1b43ac0..b0225b26f78 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Index.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Index.java
@@ -486,7 +486,7 @@ public String getSolrSchema() {
             }
             String multivalued = datasetField.getSolrField().isAllowedToBeMultivalued().toString();
             // 
-            sb.append("   \n");
+            sb.append("    \n");
         }
 
         List listOfStaticFields = new ArrayList<>();
@@ -533,8 +533,8 @@ public String getSolrSchema() {
                 }
             }
 
-            // 
-            sb.append("   \n");
+            // 
+            sb.append("    \n");
         }
 
         return sb.toString();
@@ -571,8 +571,10 @@ public Response searchDebug(
         boolean dataRelatedToMe = false;
         int numResultsPerPage = Integer.MAX_VALUE;
         SolrQueryResponse solrQueryResponse;
+        List dataverses = new ArrayList<>();
+        dataverses.add(subtreeScope);
         try {
-            solrQueryResponse = searchService.search(createDataverseRequest(user), subtreeScope, query, filterQueries, sortField, sortOrder, paginationStart, dataRelatedToMe, numResultsPerPage);
+            solrQueryResponse = searchService.search(createDataverseRequest(user), dataverses, query, filterQueries, sortField, sortOrder, paginationStart, dataRelatedToMe, numResultsPerPage);
         } catch (SearchException ex) {
             return error(Response.Status.INTERNAL_SERVER_ERROR, ex.getLocalizedMessage() + ": " + ex.getCause().getLocalizedMessage());
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java b/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java
index d351d6b573f..6b77f7fa32c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Metrics.java
@@ -2,17 +2,8 @@
 
 import edu.harvard.iq.dataverse.Metric;
 import edu.harvard.iq.dataverse.metrics.MetricsUtil;
-import java.io.StringReader;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.Map.Entry;
-import javax.json.Json;
-import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -31,13 +22,21 @@
  */
 @Path("info/metrics")
 public class Metrics extends AbstractApiBean {
+    /** Dataverses */
 
+    @GET
+    @Path("dataverses")
+    public Response getDataversesAllTime() {
+        return getDataversesToMonth(MetricsUtil.getCurrentMonth());
+    }
+    
+    @Deprecated //for better path
     @GET
     @Path("dataverses/toMonth")
     public Response getDataversesToMonthCurrent() {
         return getDataversesToMonth(MetricsUtil.getCurrentMonth());
     }
-
+    
     @GET
     @Path("dataverses/toMonth/{yyyymm}")
     public Response getDataversesToMonth(@PathParam("yyyymm") String yyyymm) {
@@ -61,6 +60,80 @@ public Response getDataversesToMonth(@PathParam("yyyymm") String yyyymm) {
         }
     }
 
+    @GET
+    @Path("dataverses/pastDays/{days}")
+    public Response getDataversesPastDays(@PathParam("days") int days) {
+        String metricName = "dataversesPastDays";
+        
+        if(days < 1) {
+            return allowCors(error(BAD_REQUEST, "Invalid parameter for number of days."));
+        }
+        try {
+            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days));
+
+            if (null == jsonString) { //run query and save
+                Long count = metricsSvc.dataversesPastDays(days);
+                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
+                jsonString = jsonObjBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, String.valueOf(days), jsonString), true); //if not using cache save new
+            }
+
+            return allowCors(ok(MetricsUtil.stringToJsonObjectBuilder(jsonString)));
+
+        } catch (Exception ex) {
+            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+        }
+    }
+    
+    @GET
+    @Path("dataverses/byCategory")
+    public Response getDataversesByCategory() {
+        String metricName = "dataversesByCategory";
+
+        try {
+            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName);
+
+            if (null == jsonArrayString) { //run query and save
+                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.dataversesByCategoryToJson(metricsSvc.dataversesByCategory());
+                jsonArrayString = jsonArrayBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, jsonArrayString), false);
+            }
+
+            return allowCors(ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString)));
+        } catch (Exception ex) {
+            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+        }
+    }
+    
+    @GET
+    @Path("dataverses/bySubject")
+    public Response getDataversesBySubject() {
+        String metricName = "dataversesBySubject";
+        
+        try {
+            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName);
+
+            if (null == jsonArrayString) { //run query and save
+                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.dataversesBySubjectToJson(metricsSvc.dataversesBySubject());
+                jsonArrayString = jsonArrayBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, jsonArrayString), false);
+            }
+
+            return allowCors(ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString)));
+        } catch (Exception ex) {
+            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+        }
+    }
+    
+    /** Datasets */
+    
+    @GET
+    @Path("datasets")
+    public Response getDatasetsAllTime() {
+        return getDatasetsToMonth(MetricsUtil.getCurrentMonth());
+    }
+    
+    @Deprecated //for better path
     @GET
     @Path("datasets/toMonth")
     public Response getDatasetsToMonthCurrent() {
@@ -89,7 +162,60 @@ public Response getDatasetsToMonth(@PathParam("yyyymm") String yyyymm) {
             return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
         }
     }
+    
+    @GET
+    @Path("datasets/pastDays/{days}")
+    public Response getDatasetsPastDays(@PathParam("days") int days) {
+        String metricName = "datasetsPastDays";
+        
+        if(days < 1) {
+            return allowCors(error(BAD_REQUEST, "Invalid parameter for number of days."));
+        }
+        try {
+            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days));
+
+            if (null == jsonString) { //run query and save
+                Long count = metricsSvc.datasetsPastDays(days);
+                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
+                jsonString = jsonObjBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, String.valueOf(days), jsonString), true); //if not using cache save new
+            }
+
+            return allowCors(ok(MetricsUtil.stringToJsonObjectBuilder(jsonString)));
+
+        } catch (Exception ex) {
+            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+        }
+    }
+    
+    @GET
+    @Path("datasets/bySubject")
+    public Response getDatasetsBySubject() {
+        String metricName = "datasetsBySubject";
+
+        try {
+            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName);
+
+            if (null == jsonArrayString) { //run query and save
+                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.datasetsBySubjectToJson(metricsSvc.datasetsBySubject());
+                jsonArrayString = jsonArrayBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, jsonArrayString), false);
+            }
+
+            return allowCors(ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString)));
+        } catch (Exception ex) {
+            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+        }
+    }
 
+    /** Files */
+    @GET
+    @Path("files")
+    public Response getFilesAllTime() {
+        return getFilesToMonth(MetricsUtil.getCurrentMonth());
+    }
+    
+    @Deprecated //for better path
     @GET
     @Path("files/toMonth")
     public Response getFilesToMonthCurrent() {
@@ -117,7 +243,41 @@ public Response getFilesToMonth(@PathParam("yyyymm") String yyyymm) {
             return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
         }
     }
+    
+    @GET
+    @Path("files/pastDays/{days}")
+    public Response getFilesPastDays(@PathParam("days") int days) {
+        String metricName = "filesPastDays";
+        
+        if(days < 1) {
+            return allowCors(error(BAD_REQUEST, "Invalid parameter for number of days."));
+        }
+        try {
+            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days));
+
+            if (null == jsonString) { //run query and save
+                Long count = metricsSvc.filesPastDays(days);
+                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
+                jsonString = jsonObjBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, String.valueOf(days), jsonString), true); //if not using cache save new
+            }
+
+            return allowCors(ok(MetricsUtil.stringToJsonObjectBuilder(jsonString)));
 
+        } catch (Exception ex) {
+            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+        }
+    }
+
+    /** Downloads */
+    
+    @GET
+    @Path("downloads")
+    public Response getDownloadsAllTime() {
+        return getDownloadsToMonth(MetricsUtil.getCurrentMonth());
+    }
+    
+    @Deprecated //for better path
     @GET
     @Path("downloads/toMonth")
     public Response getDownloadsToMonthCurrent() {
@@ -145,44 +305,30 @@ public Response getDownloadsToMonth(@PathParam("yyyymm") String yyyymm) {
             return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
         }
     }
-
+    
     @GET
-    @Path("dataverses/byCategory")
-    public Response getDataversesByCategory() {
-        String metricName = "dataversesByCategory";
-
-        try {
-            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName);
-
-            if (null == jsonArrayString) { //run query and save
-                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.dataversesByCategoryToJson(metricsSvc.dataversesByCategory());
-                jsonArrayString = jsonArrayBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, jsonArrayString), false);
-            }
-
-            return allowCors(ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString)));
-        } catch (Exception ex) {
-            return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
+    @Path("downloads/pastDays/{days}")
+    public Response getDownloadsPastDays(@PathParam("days") int days) {
+        String metricName = "downloadsPastDays";
+        
+        if(days < 1) {
+            return allowCors(error(BAD_REQUEST, "Invalid parameter for number of days."));
         }
-    }
-
-    @GET
-    @Path("datasets/bySubject")
-    public Response getDatasetsBySubject() {
-        String metricName = "datasetsBySubject";
-
         try {
-            String jsonArrayString = metricsSvc.returnUnexpiredCacheAllTime(metricName);
+            String jsonString = metricsSvc.returnUnexpiredCacheDayBased(metricName, String.valueOf(days));
 
-            if (null == jsonArrayString) { //run query and save
-                JsonArrayBuilder jsonArrayBuilder = MetricsUtil.datasetsBySubjectToJson(metricsSvc.datasetsBySubject());
-                jsonArrayString = jsonArrayBuilder.build().toString();
-                metricsSvc.save(new Metric(metricName, jsonArrayString), false);
+            if (null == jsonString) { //run query and save
+                Long count = metricsSvc.downloadsPastDays(days);
+                JsonObjectBuilder jsonObjBuilder = MetricsUtil.countToJson(count);
+                jsonString = jsonObjBuilder.build().toString();
+                metricsSvc.save(new Metric(metricName, String.valueOf(days), jsonString), true); //if not using cache save new
             }
 
-            return allowCors(ok(MetricsUtil.stringToJsonArrayBuilder(jsonArrayString)));
+            return allowCors(ok(MetricsUtil.stringToJsonObjectBuilder(jsonString)));
+
         } catch (Exception ex) {
             return allowCors(error(BAD_REQUEST, ex.getLocalizedMessage()));
         }
     }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Prov.java b/src/main/java/edu/harvard/iq/dataverse/api/Prov.java
index dd49d7badb9..bb40c53c1ca 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Prov.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Prov.java
@@ -79,7 +79,6 @@ public Response addProvJson(String body, @PathParam("id") String idSupplied, @Qu
     
     @DELETE
     @Path("{id}/prov-json")
-//MAD: SHOULD NOT WORK ON PUBLISHED
     public Response deleteProvJson(String body, @PathParam("id") String idSupplied) {
         if(!systemConfig.isProvCollectionEnabled()) {
             return error(FORBIDDEN, BundleUtil.getStringFromBundle("api.prov.error.provDisabled"));
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Search.java b/src/main/java/edu/harvard/iq/dataverse/api/Search.java
index ad83167b9fe..1b5ad74d61e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Search.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Search.java
@@ -18,10 +18,12 @@
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
 import edu.harvard.iq.dataverse.search.SortBy;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
 import javax.json.Json;
@@ -57,7 +59,7 @@ public class Search extends AbstractApiBean {
     public Response search(
             @QueryParam("q") String query,
             @QueryParam("type") final List types,
-            @QueryParam("subtree") String subtreeRequested,
+            @QueryParam("subtree") final List subtrees,
             @QueryParam("sort") String sortField,
             @QueryParam("order") String sortOrder,
             @QueryParam("per_page") final int numResultsPerPageRequested,
@@ -68,6 +70,7 @@ public Response search(
             @QueryParam("show_entity_ids") boolean showEntityIds,
             @QueryParam("show_api_urls") boolean showApiUrls,
             @QueryParam("show_my_data") boolean showMyData,
+            @QueryParam("query_entities") boolean queryEntities,
             @Context HttpServletResponse response
     ) {
 
@@ -83,42 +86,49 @@ public Response search(
             // sanity checking on user-supplied arguments
             SortBy sortBy;
             int numResultsPerPage;
-            Dataverse subtree;
+            List dataverseSubtrees = new ArrayList<>();
+
             try {
                 if (!types.isEmpty()) {
                     filterQueries.add(getFilterQueryFromTypes(types));
                 }
                 sortBy = SearchUtil.getSortBy(sortField, sortOrder);
                 numResultsPerPage = getNumberOfResultsPerPage(numResultsPerPageRequested);
-                subtree = getSubtree(subtreeRequested);
-                if (!subtree.equals(dataverseService.findRootDataverse())) {
-                    String dataversePath = dataverseService.determineDataversePath(subtree);
-                    String filterDownToSubtree = SearchFields.SUBTREE + ":\"" + dataversePath + "\"";
-                    /**
-                     * @todo Should filterDownToSubtree logic be centralized in
-                     * SearchServiceBean?
-                     */
-                    filterQueries.add(filterDownToSubtree);
+                
+                 // we have to add "" (root) otherwise there is no permissions check
+                if(subtrees.isEmpty()) {
+                    dataverseSubtrees.add(getSubtree(""));
+                }
+                else {
+                    for(String subtree : subtrees) {
+                        dataverseSubtrees.add(getSubtree(subtree));
+                    }
+                }
+                filterQueries.add(getFilterQueryFromSubtrees(dataverseSubtrees));
+                
+                if(filterQueries.isEmpty()) { //Extra sanity check just in case someone else touches this
+                    throw new IOException("Filter is empty, which should never happen, as this allows unfettered searching of our index");
                 }
+                
             } catch (Exception ex) {
                 return error(Response.Status.BAD_REQUEST, ex.getLocalizedMessage());
             }
 
             // users can't change these (yet anyway)
             boolean dataRelatedToMe = showMyData; //getDataRelatedToMe();
-
+            
             SolrQueryResponse solrQueryResponse;
             try {
-                solrQueryResponse = searchService.search(
-                        createDataverseRequest(user),
-                        subtree,
+                solrQueryResponse = searchService.search(createDataverseRequest(user),
+                        dataverseSubtrees,
                         query,
                         filterQueries,
                         sortBy.getField(),
                         sortBy.getOrder(),
                         paginationStart,
                         dataRelatedToMe,
-                        numResultsPerPage
+                        numResultsPerPage,
+                        queryEntities
                 );
             } catch (SearchException ex) {
                 Throwable cause = ex;
@@ -245,7 +255,7 @@ private int getNumberOfResultsPerPage(int numResultsPerPage) {
         /**
          * @todo should maxLimit be configurable?
          */
-        int maxLimit = 1000;
+        int maxLimit = 1000; 
         if (numResultsPerPage == 0) {
             /**
              * @todo should defaultLimit be configurable?
@@ -295,6 +305,37 @@ private String getFilterQueryFromTypes(List types) throws Exception {
         filterQuery = SearchFields.TYPE + ":(" + StringUtils.join(typeRequested, " OR ") + ")";
         return filterQuery;
     }
+    
+    //Only called when there is content
+    /**
+    * @todo (old) Should filterDownToSubtree logic be centralized in
+    * SearchServiceBean?
+    */
+    private String getFilterQueryFromSubtrees(List subtrees) throws Exception {
+        String subtreesFilter = "";
+        
+        for(Dataverse dv : subtrees) {
+            if (!dv.equals(dataverseService.findRootDataverse())) {
+                String dataversePath = dataverseService.determineDataversePath(dv);
+
+                subtreesFilter += "\"" + dataversePath + "\" OR ";
+
+            }
+        }
+        try{
+            subtreesFilter = subtreesFilter.substring(0, subtreesFilter.lastIndexOf("OR"));
+        } catch (StringIndexOutOfBoundsException ex) {
+            //This case should only happen the root subtree is searched 
+            //and there are no ORs in the string
+            subtreesFilter = "";
+        }
+        
+        if(!subtreesFilter.equals("")) {
+            subtreesFilter =  SearchFields.SUBTREE + ":(" + subtreesFilter + ")";
+        }
+        
+        return subtreesFilter;
+    }
 
     private Dataverse getSubtree(String alias) throws Exception {
         if (StringUtils.isBlank(alias)) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java b/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java
new file mode 100644
index 00000000000..787c3380e5b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/api/SiteMap.java
@@ -0,0 +1,31 @@
+package edu.harvard.iq.dataverse.api;
+
+import edu.harvard.iq.dataverse.sitemap.SiteMapServiceBean;
+import edu.harvard.iq.dataverse.sitemap.SiteMapUtil;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Stateless
+@Path("admin/sitemap")
+public class SiteMap extends AbstractApiBean {
+
+    @EJB
+    SiteMapServiceBean siteMapSvc;
+
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response updateSiteMap() {
+        boolean stageFileExists = SiteMapUtil.stageFileExists();
+        if (stageFileExists) {
+            return error(Response.Status.BAD_REQUEST, "Sitemap cannot be updated because staged file exists.");
+        }
+        siteMapSvc.updateSiteMap(dataverseSvc.findAll(), datasetSvc.findAll());
+        return ok("Sitemap update has begun. Check logs for status.");
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
index c88e54bdb88..c5fa1d79fce 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
@@ -16,6 +16,7 @@
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.ByteArrayInputStream;
@@ -200,6 +201,9 @@ public DepositReceipt addResource(String uri, Deposit deposit, AuthCredentials a
     }
 
     DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials authCredentials, SwordConfiguration swordConfiguration, boolean shouldReplace) throws SwordError, SwordAuthException, SwordServerException {
+        if (!systemConfig.isHTTPUpload()) {
+            throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, BundleUtil.getStringFromBundle("file.api.httpDisabled"));
+        }
         AuthenticatedUser user = swordAuth.auth(authCredentials);
         DataverseRequest dvReq = new DataverseRequest(user, httpRequest);
 
@@ -217,12 +221,14 @@ DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials au
             }
             
             //---------------------------------------
-            // Make sure that the upload type is not rsync
+            // Make sure that the upload type is not rsync - handled above for dual mode
             // ------------------------------------- 
-            if (DataCaptureModuleUtil.rsyncSupportEnabled(settingsSvc.getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
-                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, SettingsServiceBean.Key.UploadMethods + " contains " + SystemConfig.FileUploadMethods.RSYNC + ". Please use rsync file upload.");
-            }
 
+            if (dataset.getEditVersion().isHasPackageFile()) {                
+                throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, BundleUtil.getStringFromBundle("file.api.alreadyHasPackageFile"));
+            }
+            
+            
             // Right now we are only supporting UriRegistry.PACKAGE_SIMPLE_ZIP but
             // in the future maybe we'll support other formats? Rdata files? Stata files?
             /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
index 591998d117c..62a213ecf39 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
@@ -93,6 +93,7 @@ public class ImportDDIServiceBean {
     public static final String NOTE_TYPE_REPLICATION_FOR = "DVN:REPLICATION_FOR";
     private static final String HARVESTED_FILE_STORAGE_PREFIX = "http://";
     private XMLInputFactory xmlInputFactory = null;
+    private static final Logger logger = Logger.getLogger(ImportDDIServiceBean.class.getName());
          
     @EJB CustomFieldServiceBean customFieldService;
    
@@ -129,6 +130,7 @@ public Map mapDDI(ImportType importType, String xmlToParse, Data
         StringReader reader = new StringReader(xmlToParse);
         XMLStreamReader xmlr = null;
         XMLInputFactory xmlFactory = javax.xml.stream.XMLInputFactory.newInstance();
+        xmlFactory.setProperty("javax.xml.stream.isCoalescing", true); // allows the parsing of a CDATA segment into a single event
         xmlr = xmlFactory.createXMLStreamReader(reader);
         processDDI(importType, xmlr, datasetDTO, filesMap);
 
@@ -200,9 +202,13 @@ private void processDDI(ImportType importType, XMLStreamReader xmlr, DatasetDTO
                 
             }
         }
+
          if (isHarvestImport(importType)) {
             datasetDTO.getDatasetVersion().setVersionState(VersionState.RELEASED);
-       
+
+         }
+         else {
+             datasetDTO.getDatasetVersion().setVersionState(VersionState.DRAFT);
          }
         
 
@@ -410,9 +416,7 @@ else if (xmlr.getLocalName().equals("relStdy")) {
                         //   rp.setText( (String) rpFromDDI );
                     }
                     publications.add(set);
-                    if (publications.size()>0) {
-                        getCitation(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO(DatasetFieldConstant.publication, publications));
-                    }
+
 
                 } else if (xmlr.getLocalName().equals("otherRefs")) {
 
@@ -422,7 +426,9 @@ else if (xmlr.getLocalName().equals("relStdy")) {
 
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
-
+                if (publications.size()>0) {
+                    getCitation(dvDTO).addField(FieldDTO.createMultipleCompoundFieldDTO(DatasetFieldConstant.publication, publications));
+                }
                 if (xmlr.getLocalName().equals("othrStdyMat")) {
                     return;
                 }
@@ -484,7 +490,8 @@ private void processStdyInfo(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                 } else if (xmlr.getLocalName().equals("abstract")) {
                     HashSet set = new HashSet<>();
                     addToSet(set,"dsDescriptionDate", xmlr.getAttributeValue(null, "date"));
-                    addToSet(set,"dsDescriptionValue",  parseText(xmlr, "abstract"));
+                    Map dsDescriptionDetails = parseCompoundText(xmlr, "abstract");
+                    addToSet(set,"dsDescriptionValue",  dsDescriptionDetails.get("name"));
                     if (!set.isEmpty()) {
                         descriptions.add(set);
                     }
@@ -741,7 +748,8 @@ private void processMethod(XMLStreamReader xmlr, DatasetVersionDTO dvDTO ) throw
                     if (NOTE_TYPE_EXTENDED_METADATA.equalsIgnoreCase(noteType) ) {
                         processCustomField(xmlr, dvDTO);                       
                     } else {
-                        addNote("Subject: Study Level Error Note, Notes: "+ parseText( xmlr,"notes" ) +";", dvDTO);
+                        processNotes(xmlr, dvDTO);
+//                        addNote("Subject: Study Level Error Note, Notes: "+ parseText( xmlr,"notes" ) +";", dvDTO);
                        
                     }
                 } else if (xmlr.getLocalName().equals("anlyInfo")) {
@@ -897,6 +905,7 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
         String collMode = "";
         String timeMeth = "";
         String weight = "";
+        String dataCollector = "";
         
         for (int event = xmlr.next(); event != XMLStreamConstants.END_DOCUMENT; event = xmlr.next()) {
             if (event == XMLStreamConstants.START_ELEMENT) {
@@ -911,7 +920,14 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                     }
                   //socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("timeMethod", parseText( xmlr, "timeMeth" )));
                } else if (xmlr.getLocalName().equals("dataCollector")) {
-                   socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("dataCollector", parseText( xmlr, "dataCollector" )));
+//                   socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("dataCollector", parseText( xmlr, "dataCollector" )));
+                    String thisValue = parseText( xmlr, "dataCollector");
+                    if (!StringUtil.isEmpty(thisValue)) {
+                        if (!"".equals(dataCollector)) {
+                            dataCollector = dataCollector.concat(", ");
+                        }
+                        dataCollector = dataCollector.concat(thisValue);
+                    }
                 // frequencyOfDataCollection    
                 } else if (xmlr.getLocalName().equals("frequenc")) {
                   socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("frequencyOfDataCollection", parseText( xmlr, "frequenc" )));
@@ -968,6 +984,9 @@ private void processDataColl(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) thro
                     if (!StringUtil.isEmpty(weight)) {
                         socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("weighting", weight));
                     }
+                    if (!StringUtil.isEmpty(dataCollector)) {
+                        socialScience.getFields().add(FieldDTO.createPrimitiveFieldDTO("dataCollector", dataCollector));
+                    }
                     return;
                 }
             }
@@ -1049,7 +1068,7 @@ private void processVerStmt(ImportType importType, XMLStreamReader xmlr, Dataset
         if (isNewImport(importType)) {
             // If this is a new, Draft version, versionNumber and minor versionNumber are null.
             dvDTO.setVersionState(VersionState.DRAFT);
-        } 
+        }
     }
     
       private void processDataAccs(XMLStreamReader xmlr, DatasetVersionDTO dvDTO) throws XMLStreamException {
@@ -1632,7 +1651,8 @@ private void addToSet(HashSet set, String typeName, String value ) {
             set.add(FieldDTO.createPrimitiveFieldDTO(typeName, value));
         }
     }
-    
+
+    // TODO : determine what is going on here ?
     private void processOtherMat(XMLStreamReader xmlr, DatasetDTO datasetDTO) throws XMLStreamException {
         FileMetadataDTO fmdDTO = new FileMetadataDTO();
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
index 5fdb0e4ff64..324af83afa2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
@@ -383,6 +383,23 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve
         }
         return importedDataset;
     }
+
+    public JsonObject ddiToJson(String xmlToParse) throws ImportException{
+        DatasetDTO dsDTO = null;
+
+        try {
+            dsDTO = importDDIService.doImport(ImportType.IMPORT, xmlToParse);
+        } catch (XMLStreamException e) {
+            throw new ImportException("XMLStreamException" + e);
+        }
+        // convert DTO to Json,
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        String json = gson.toJson(dsDTO);
+        JsonReader jsonReader = Json.createReader(new StringReader(json));
+        JsonObject obj = jsonReader.readObject();
+
+        return obj;
+    }
     
     public JsonObjectBuilder doImport(DataverseRequest dataverseRequest, Dataverse owner, String xmlToParse, String fileName, ImportType importType, PrintWriter cleanupLog) throws ImportException, IOException {
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportUtil.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportUtil.java
index 6c3e35c1d73..d47c20e4e12 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportUtil.java
@@ -12,7 +12,9 @@
 public interface ImportUtil {
    public enum ImportType{ 
        /** ? */
-       NEW, 
+       NEW,
+       /** TODO: had to do a distinction because of otherMath tag causing problem, will be discussing about it in pull request **/
+       IMPORT,
 
        /** Data is harvested from another Dataverse instance */
        HARVEST
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
index 51cc7f4b85e..0395c2453db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
@@ -781,11 +781,12 @@ public AuthenticatedUser canLogInAsBuiltinUser(String username, String password)
 
         AuthenticationRequest authReq = new AuthenticationRequest();
         /**
-         * @todo Should this really be coming from a bundle like this? Added
-         * because that's what BuiltinAuthenticationProvider does.
+         * @todo Should the credential key really be a Bundle key?
+         * BuiltinAuthenticationProvider.KEY_USERNAME_OR_EMAIL, for example, is
+         * "login.builtin.credential.usernameOrEmail" as of this writing.
          */
-        authReq.putCredential(BundleUtil.getStringFromBundle("login.builtin.credential.usernameOrEmail"), username);
-        authReq.putCredential(BundleUtil.getStringFromBundle("login.builtin.credential.password"), password);
+        authReq.putCredential(BuiltinAuthenticationProvider.KEY_USERNAME_OR_EMAIL, username);
+        authReq.putCredential(BuiltinAuthenticationProvider.KEY_PASSWORD, password);
         /**
          * @todo Should probably set IP address here.
          */
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/CredentialsAuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/CredentialsAuthenticationProvider.java
index 2b1ab3d0a33..ff8aca9c0a7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/CredentialsAuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/CredentialsAuthenticationProvider.java
@@ -12,23 +12,23 @@
 public interface CredentialsAuthenticationProvider extends AuthenticationProvider {
     
     static class Credential { 
-        private final String title;
+        private final String key;
         
         /**
          * When {@code true}, the login form will use the secret/password widget rather than the regular text field.
          */
         private final boolean secret;
 
-        public Credential(String title, boolean secret) {
-            this.title = title;
+        public Credential(String key, boolean secret) {
+            this.key = key;
             this.secret = secret;
         }
-        public Credential(String title) {
-            this( title, false); 
+        public Credential(String key) {
+            this( key, false); 
         }
        
-        public String getTitle() {
-            return title;
+        public String getKey() {
+            return key;
         }
 
         public boolean isSecret() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java
index 501a0db6414..ac55e7d8658 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java
@@ -3,9 +3,12 @@
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.util.BitSet;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.MissingResourceException;
 import java.util.Objects;
 import java.util.Set;
 import javax.persistence.Column;
@@ -36,6 +39,8 @@
 			    query= "SELECT r FROM DataverseRole r WHERE r.owner is null ORDER BY r.name"),
     @NamedQuery(name = "DataverseRole.findBuiltinRoleByAlias",
 			    query= "SELECT r FROM DataverseRole r WHERE r.alias=:alias AND r.owner is null"),
+        @NamedQuery(name = "DataverseRole.findCustomRoleByAliasAndOwner",
+			    query= "SELECT r FROM DataverseRole r WHERE r.alias=:alias and (r.owner is null or r.owner.id=:ownerId)"),
 	@NamedQuery(name = "DataverseRole.listAll",
 			    query= "SELECT r FROM DataverseRole r"),
 	@NamedQuery(name = "DataverseRole.deleteById",
@@ -63,6 +68,8 @@ public class DataverseRole implements Serializable  {
     public static final String CURATOR = "curator";
     public static final String MEMBER = "member";
     
+    public static final String NONE = "none";
+    
     
 	public static final Comparator CMP_BY_NAME = new Comparator(){
 
@@ -116,17 +123,48 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        if (alias != null) {
+            try {
+                String key = "role." + alias.toLowerCase() + ".name";
+                String _name = BundleUtil.getStringFromPropertyFile(key, "BuiltInRoles");
+                if (_name == null) {
+                    return name;
+                } else {
+                    return _name;
+                }
+            } catch (MissingResourceException mre) {
+                return name;
+            }
+
+        } else {
+            return name;
+        }
+    }
 
 	public void setName(String name) {
 		this.name = name;
 	}
 
-	public String getDescription() {
-		return description;
-	}
+    public String getDescription() {
+        if (alias != null) {
+            String key = "role." + alias.toLowerCase() + ".description";
+            try {
+                String _description = BundleUtil.getStringFromPropertyFile(key, "BuiltInRoles");
+                if (_description == null) {
+                    return description;
+                } else {
+                    return _description;
+                }
+
+            } catch (MissingResourceException mre) {
+                return description;
+            }
+
+        } else {
+            return description;
+        }
+    }
 
 	public void setDescription(String description) {
 		this.description = description;
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java
index 5337d02d559..7fd7a40587f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java
@@ -79,7 +79,11 @@ public enum Permission implements java.io.Serializable {
     }
 
     public String getHumanName() {
-        return humanName;
+        return BundleUtil.getStringFromBundle("permission."+name()+".desc");
+    }
+
+    public String getDisplayName() {
+        return BundleUtil.getStringFromBundle("permission."+name()+".label");
     }
 
     public boolean appliesTo(Class aClass) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/RoleAssignmentSet.java b/src/main/java/edu/harvard/iq/dataverse/authorization/RoleAssignmentSet.java
index 01df10eac76..65f7edc0941 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/RoleAssignmentSet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/RoleAssignmentSet.java
@@ -11,6 +11,9 @@
  * 
  * LATER: we could probably refactor this class out.
  * @author michael
+ * 
+ * We definitely should factor this out.
+ * Oscar
  */
 public class RoleAssignmentSet implements Iterable {
 	
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupProvider.java
index 84dd944191a..b5d719c6ccd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupProvider.java
@@ -27,14 +27,6 @@ public interface GroupProvider {
      */
     public String getGroupProviderInfo();
     
-    /**
-     * Looks up the groups this provider has for a dataverse request, in the context of a {@link DvObject}.
-     * @param req The request whose group memberships we evaluate.
-     * @param dvo the DvObject which is the context for the groups. May be {@code null}.
-     * @return The set of groups the user is member of.
-     */
-    public Set groupsFor( DataverseRequest req, DvObject dvo );
-    
     /**
      * Looks up the groups this provider has for a role assignee, in the context of a {@link DvObject}.
      * This method should be used for group management. Groups for actual requests should be determined
@@ -46,6 +38,18 @@ public interface GroupProvider {
      */
     public Set groupsFor( RoleAssignee ra, DvObject dvo );
     
+    /**
+     * Looks up the groups this provider has for a dataverse request, in the context of a {@link DvObject}.
+     * @param req The request whose group memberships we evaluate.
+     * @param dvo the DvObject which is the context for the groups. May be {@code null}.
+     * @return The set of groups the user is member of.
+     */
+    public Set groupsFor( DataverseRequest req, DvObject dvo );
+    
+    public Set groupsFor( RoleAssignee ra);
+    
+    public Set groupsFor(DataverseRequest req);
+    
     public T get( String groupAlias );
 
     public Set findGlobalGroups();
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
index 79f2e85613f..eb841af508a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
@@ -11,7 +11,6 @@
 import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.IpGroupsServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroupProvider;
 import edu.harvard.iq.dataverse.authorization.groups.impl.shib.ShibGroupServiceBean;
-import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import java.util.Collection;
 import java.util.HashMap;
@@ -87,11 +86,9 @@ public ShibGroupProvider getShibGroupProvider() {
      * @return The groups {@code req} is part of under {@code dvo}.
      */
     public Set groupsFor( DataverseRequest req, DvObject dvo ) {
-        return groupTransitiveClosure(
-                groupProviders.values().stream()
+        return groupProviders.values().stream()
                               .flatMap(gp->(Stream)gp.groupsFor(req, dvo).stream())
-                              .collect(toSet()),
-                dvo);
+                              .collect(toSet());
     }
     
     /**
@@ -102,11 +99,9 @@ public Set groupsFor( DataverseRequest req, DvObject dvo ) {
      * @return 
      */
     public Set groupsFor( RoleAssignee ra, DvObject dvo ) {
-        return groupTransitiveClosure(
-                groupProviders.values().stream()
+        return groupProviders.values().stream()
                               .flatMap(gp->(Stream)gp.groupsFor(ra, dvo).stream())
-                              .collect( toSet() ),
-                dvo);
+                              .collect( toSet() );
     }
 
     /**
@@ -120,32 +115,17 @@ public Set groupsFor( RoleAssignee ra, DvObject dvo ) {
      * @deprecated Does not look into IP Groups. Use {@link #groupsFor(edu.harvard.iq.dataverse.engine.command.DataverseRequest)}
      */
     @Deprecated
-    public Set groupsFor(AuthenticatedUser au) {
-        Set groups = new HashSet<>();
-        groups.addAll(groupsFor(au, null));
-        String identifier = au.getIdentifier();
-        if (identifier != null) {
-            try {
-                groups.addAll( explicitGroupService.findGroups(au) );
-            } catch (IndexOutOfBoundsException ex) {
-                logger.log(Level.INFO, "Couldn''t trim first character (@ sign) from identifier: {0}", identifier);
-            }
-        }
-
-        return groups;
+    public Set groupsFor(RoleAssignee ra) {
+        return groupProviders.values().stream()
+                             .flatMap(gp->(Stream)gp.groupsFor(ra).stream())
+                             .collect(toSet());
     }
 
     
-    public Set groupsFor( DataverseRequest dr ) {
-        Set groups = new HashSet<>();
-        
-        // get the global groups
-        groups.addAll( groupsFor(dr,null) );
-        
-        // add the explicit groups
-        groups.addAll( explicitGroupService.findGroups(dr.getUser()) );
-        
-        return groups;
+    public Set groupsFor( DataverseRequest req ) {
+        return groupProviders.values().stream()
+                             .flatMap(gp->(Stream)gp.groupsFor(req).stream())
+                             .collect( toSet());
     }
     
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java
index cb6da272dda..af9ab080443 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/builtin/BuiltInGroupsProvider.java
@@ -40,15 +40,25 @@ public String getGroupProviderInfo() {
 
     @Override
     public Set groupsFor(DataverseRequest req, DvObject dvo ) {
-        return groupsFor(req.getUser(), dvo );
+        return groupsFor(req.getUser());
     }
 
     @Override
     public Set groupsFor( RoleAssignee ra, DvObject dvo ) {
-        if ( ra instanceof User) {
-            return (Set) ((ra instanceof AuthenticatedUser)
-                    ? CollectionHelper.asSet(AllUsers.get(), AuthenticatedUsers.get())
-                    : Collections.singleton(AllUsers.get()));
+        return groupsFor(ra);
+    }
+    
+    @Override
+    public Set groupsFor(DataverseRequest req) {
+        return groupsFor(req.getUser());
+    }
+
+    @Override
+    public Set groupsFor(RoleAssignee ra) {
+        if (ra instanceof AuthenticatedUser){
+            return CollectionHelper.asSet(AllUsers.get(), AuthenticatedUsers.get());
+        } else if ( ra instanceof User) {
+            return Collections.singleton(AllUsers.get());
         } else {
             return Collections.emptySet();
         }
@@ -64,5 +74,4 @@ public Group get(String groupAlias) {
     public Set findGlobalGroups() {
         return CollectionHelper.asSet(AllUsers.get(), AuthenticatedUsers.get());
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java
index 018689ec524..93de4480e55 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java
@@ -7,7 +7,7 @@
 import edu.harvard.iq.dataverse.authorization.RoleAssigneeDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.authorization.groups.GroupException;
-import edu.harvard.iq.dataverse.authorization.groups.impl.ipaddress.ip.IpAddress;
+import edu.harvard.iq.dataverse.authorization.groups.impl.builtin.AuthenticatedUsers;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import java.util.HashSet;
 import java.util.Objects;
@@ -67,7 +67,6 @@
     @NamedQuery( name="ExplicitGroup.findByContainedExplicitGroupId",
                  query="SELECT eg FROM ExplicitGroup eg join eg.containedExplicitGroups ceg "
                       +"WHERE ceg.id=:containedExplicitGroupId")
-        
 })
 @Entity
 @Table(indexes = {@Index(columnList="owner_id"),
@@ -139,6 +138,11 @@ public Set getContainedAuthenticatedUsers() {
     }
 
     public Set getContainedExplicitGroups() {
+        if ( getGroupProvider() != null ) {
+            for ( ExplicitGroup g : containedExplicitGroups ) {
+                g.setProvider(getGroupProvider());
+            }
+        }
         return containedExplicitGroups;
     }
 
@@ -148,6 +152,7 @@ public Set getContainedExplicitGroups() {
     protected ExplicitGroup() {}
     
     public void add( User u ) {
+        if ( u == null ) throw new IllegalArgumentException("Cannot add a null user to an explicit group.");
         if ( u instanceof AuthenticatedUser ) {
             containedAuthenticatedUsers.add((AuthenticatedUser)u);
         } else {
@@ -205,7 +210,7 @@ public void remove(RoleAssignee roleAssignee) {
     public Set getContainedRoleAssgineeIdentifiers() {
         Set retVal = new TreeSet<>();
         retVal.addAll( containedRoleAssignees );
-        for ( ExplicitGroup subg : containedExplicitGroups ) {
+        for ( ExplicitGroup subg : getContainedExplicitGroups() ) {
             retVal.add( subg.getIdentifier() );
         }
         for ( AuthenticatedUser au : containedAuthenticatedUsers ) {
@@ -242,7 +247,7 @@ public void removeByRoleAssgineeIdentifier( String idtf ) {
     public Set getDirectMembers() {
         Set res = new HashSet<>();
         
-        res.addAll( containedExplicitGroups );
+        res.addAll( getContainedExplicitGroups() );
         res.addAll( containedAuthenticatedUsers );
         for ( String idtf : containedRoleAssignees ) {
             RoleAssignee ra = provider.findRoleAssignee(idtf);
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupProvider.java
index cb204e528f6..8ebb289f07e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupProvider.java
@@ -48,17 +48,27 @@ public String getGroupProviderInfo() {
      */
     @Override
     public Set groupsFor(DataverseRequest req, DvObject o) {
-        return explicitGroupSvc.findGroups(req.getUser(), o);
+        return updateProvider(explicitGroupSvc.findGroups(req.getUser(), o));
     }
     
     @Override
     public Set groupsFor(RoleAssignee ra, DvObject o) {
-        return explicitGroupSvc.findGroups(ra, o);
+        return updateProvider(explicitGroupSvc.findGroups(ra, o));
+    }
+    
+    @Override
+    public Set groupsFor(RoleAssignee ra) {
+        return updateProvider(explicitGroupSvc.findGroups(ra));
     }
 
+    @Override
+    public Set groupsFor(DataverseRequest req) {
+        return updateProvider(explicitGroupSvc.findGroups(req.getUser()));
+    }
+    
     @Override
     public ExplicitGroup get(String groupAlias) {
-        return explicitGroupSvc.findByAlias( groupAlias );
+        return updateProvider(explicitGroupSvc.findByAlias(groupAlias));
     }
 
     /**
@@ -75,7 +85,7 @@ public ExplicitGroup makeGroup() {
     }
     
     /**
-     * Finds the role asgineed whose identifier is given. While this is basically
+     * Finds the role assignee whose identifier is given. While this is basically
      * a delegation to {@link RoleAssigneeServiceBean}, we need it as a way of
      * dependency injection for {@link ExplicitGroup}s, which need to access the 
      * server context but are POJOs rather than enterprise beans.
@@ -93,6 +103,9 @@ RoleAssignee findRoleAssignee( String roleAssigneeIdtf ) {
      * @return the passed group, updated.
      */
     ExplicitGroup updateProvider( ExplicitGroup eg ) {
+        if (eg == null) {
+            return null; 
+        }
         eg.setProvider(this);
         return eg;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
index 3e49fca3b65..de9b9ba530d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
@@ -10,7 +10,10 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import static java.util.stream.Collectors.joining;
 import javax.annotation.PostConstruct;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
@@ -29,14 +32,40 @@
 @Stateless
 public class ExplicitGroupServiceBean {
     
+    private static final Logger logger = Logger.getLogger(ExplicitGroupServiceBean.class.getName());
     @EJB
     private RoleAssigneeServiceBean roleAssigneeSvc;
     
     @PersistenceContext(unitName = "VDCNet-ejbPU")
-	protected EntityManager em;
+    protected EntityManager em;
 	
     ExplicitGroupProvider provider;
     
+    /**
+     * A PostgreSQL-specific query that returns a group and all the groups
+     * that contain it, and their parents too (-> recourse up teh containment
+     * hierarchy of the explicit groups). Takes the group id as a parameter.
+     */
+    private static final String FIND_ALL_PARENTS_QUERY_TEMPLATE = "WITH RECURSIVE\n" +
+        "explicit_group_graph AS (\n" +
+        "  SELECT\n" +
+        "     eg.id as id,\n" +
+        "     ee.explicitgroup_id as parent_group_id\n" +
+        "  FROM explicitgroup eg \n" +
+        "    LEFT JOIN explicitgroup_explicitgroup ee \n" +
+        "      ON eg.id=ee.containedexplicitgroups_id\n" +
+        "),\n" +
+        "parents AS (\n" +
+        "  SELECT * FROM explicit_group_graph\n" +
+        "  WHERE \n" +
+        "    id IN (@IDS)\n" +
+        "  UNION ALL\n" +
+        "  SELECT egg.*\n" +
+        "  FROM explicit_group_graph egg, parents\n" +
+        "  WHERE parents.parent_group_id = egg.id\n" +
+        ") SELECT * from explicitgroup \n" +
+        "WHERE id IN (SELECT distinct id FROM parents);";
+    
     @PostConstruct
     void setup() {
         provider = new ExplicitGroupProvider(this, roleAssigneeSvc);
@@ -114,15 +143,6 @@ public Set findAvailableFor( DvObject d ) {
         return provider.updateProvider( egs );
     }
     
-    /**
-     * Finds all the explicit groups {@code ra} is a member of.
-     * @param ra the role assignee whose membership list we seek
-     * @return set of the explicit groups that contain {@code ra}.
-     */
-    public Set findGroups( RoleAssignee ra ) {
-        return findClosure(findDirectlyContainingGroups(ra));
-    }
-    
     /**
      * Finds all the explicit groups {@code ra} is directly a member of.
      * To find all these groups and the groups the contain them (recursively upwards),
@@ -156,6 +176,16 @@ public Set findDirectlyContainingGroups( RoleAssignee ra ) {
         }
     }
 
+    
+    /**
+     * Finds all the explicit groups {@code ra} is a member of.
+     * @param ra the role assignee whose membership list we seek
+     * @return set of the explicit groups that contain {@code ra}.
+     */
+    public Set findGroups( RoleAssignee ra ) {
+        return findClosure(findDirectlyContainingGroups(ra));
+    }
+    
     /**
      * Finds all the groups {@code ra} is a member of, in the context of {@code o}.
      * This includes both direct and indirect memberships.
@@ -164,9 +194,7 @@ public Set findDirectlyContainingGroups( RoleAssignee ra ) {
      * @return All the groups in {@code o}'s context that {@code ra} is a member of.
      */
     public Set findGroups( RoleAssignee ra, DvObject o ) {
-        Set directGroups = findDirectGroups(ra, o);
-        Set closure = findClosure(directGroups);
-        return closure.stream()
+        return findGroups(ra).stream()
                 .filter( g -> g.owner.isAncestorOf(o) )
                 .collect( Collectors.toSet() );
     }
@@ -225,22 +253,17 @@ public Set findDirectGroups( RoleAssignee ra, DvObject o ) {
      * @return Transitive closure (based on group  containment) of the groups in {@code seed}.
      */
     protected Set findClosure( Set seed ) {
-        Set result = new HashSet<>();
         
-        // The set of groups whose parents were not visited yet.
-        Set fringe = new HashSet<>(seed);
-        while ( ! fringe.isEmpty() ) {
-           ExplicitGroup g = fringe.iterator().next();
-           fringe.remove(g);
-           result.add(g);
-           
-           // add all of g's parents to the fringe, unless already visited.
-           findDirectlyContainingGroups(g).stream()
-                   .filter( eg -> !(result.contains(eg)||fringe.contains(eg) ))
-                   .forEach( fringe::add );
-        }
-
-        return result;
+        if ( seed.isEmpty() ) return Collections.emptySet();
+        
+        String ids = seed.stream().map(eg->Long.toString(eg.getId())).collect( joining(",") );
+        
+        // PSQL driver has issues with arrays and collections as parameters, so we're using 
+        // string manipulation to create the query here. Not ideal, but seems to be
+        // the only solution at the Java Persistence level (i.e. without downcasting to org.postgresql.*)
+        String sqlCode = FIND_ALL_PARENTS_QUERY_TEMPLATE.replace("@IDS", ids);
+        return new HashSet<>(em.createNativeQuery(sqlCode, ExplicitGroup.class)
+            .getResultList());
     }
     
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupProvider.java
index 7cf1b6818cb..64e6651e9f8 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupProvider.java
@@ -34,16 +34,26 @@ public String getGroupProviderInfo() {
     public Set groupsFor(RoleAssignee ra, DvObject o) {
         return Collections.emptySet();
     }
-    
+
+    @Override
+    public Set groupsFor(RoleAssignee ra) {
+        return Collections.emptySet();
+    }
+        
     @Override
     public Set groupsFor( DataverseRequest req, DvObject dvo ) {
+        return groupsFor(req);
+    }
+
+    @Override
+    public Set groupsFor( DataverseRequest req) {
         if ( req.getSourceAddress() != null ) {
             return updateProvider( ipGroupsService.findAllIncludingIp(req.getSourceAddress()) );
         } else {
             return Collections.emptySet();
         }
     }
-
+    
     @Override
     public IpGroup get(String groupAlias) {
         return setProvider(ipGroupsService.getByGroupName(groupAlias));
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java
index d6cfb8b7f6e..c03cf26e11e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/ipaddress/IpGroupsServiceBean.java
@@ -9,7 +9,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
@@ -104,7 +103,7 @@ public Set findAllIncludingIp( IpAddress ipa ) {
             List groupList = em.createNamedQuery("IPv4Range.findGroupsContainingAddressAsLong", IpGroup.class)
                     .setParameter("addressAsLong", ip4.toBigInteger()).getResultList();
             return new HashSet<>(groupList);
-            
+
         } else if ( ipa instanceof IPv6Address ) {
             IPv6Address ip6 = (IPv6Address) ipa;
             long[] ip6arr = ip6.toLongArray();
@@ -115,7 +114,7 @@ public Set findAllIncludingIp( IpAddress ipa ) {
                     .setParameter("d", ip6arr[3])
                     .getResultList();
             return new HashSet<>(groupList);
-            
+
         } else {
             throw new IllegalArgumentException( "Unknown IpAddress type: " + ipa.getClass() + " (for IpAddress:" + ipa + ")" );
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupProvider.java
index 630ce4c3536..a17283b2273 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupProvider.java
@@ -37,23 +37,28 @@ public String getGroupProviderInfo() {
 
     @Override
     public Set groupsFor( DataverseRequest req, DvObject dvo ) {
-        return groupsFor( req.getUser(), dvo );
+        return groupsFor(req.getUser());
     }
     
     @Override
-    public Set groupsFor(RoleAssignee ra, DvObject o) {
-        if ( ra instanceof User ) {
-            User user = (User) ra;
-            Set shibGroups = new HashSet<>();
-            if ( user instanceof AuthenticatedUser ) {
-                AuthenticatedUser authenticatedUser = (AuthenticatedUser) user;
-                Set groupsFor = shibGroupService.findFor(authenticatedUser);
-                for (ShibGroup shibGroup : groupsFor) {
-                    shibGroup.setShibGroupProvider(this);
-                }
-                return groupsFor;
+    public Set groupsFor(RoleAssignee ra, DvObject dvo) {
+        return groupsFor(ra);
+    }
+    
+    @Override
+    public Set groupsFor( DataverseRequest req) {
+        return groupsFor(req.getUser());
+    }
+    
+    @Override
+    public Set groupsFor(RoleAssignee ra) {
+        if (ra instanceof AuthenticatedUser) {
+            AuthenticatedUser authenticatedUser = (AuthenticatedUser) ra;
+            Set groupsFor = shibGroupService.findFor(authenticatedUser);
+            for (ShibGroup shibGroup : groupsFor) {
+                shibGroup.setShibGroupProvider(this);
             }
-            return shibGroups;
+            return groupsFor;
         } else {
             return Collections.emptySet();
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java
index e4876b5e046..c15e56ee7e0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/shib/ShibGroupServiceBean.java
@@ -39,7 +39,7 @@ public class ShibGroupServiceBean {
     GroupServiceBean groupService;
     @EJB
     ActionLogServiceBean actionLogSvc;
-	
+
     /**
      * @return A ShibGroup or null.
      */
@@ -61,17 +61,16 @@ public List findAll() {
 
     public ShibGroup save(String name, String shibIdpAttribute, String shibIdp) {
         ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.GlobalGroups, "shibCreate");
-        alr.setInfo( name + ": " + shibIdp + "/" + shibIdpAttribute );
-        
+        alr.setInfo(name + ": " + shibIdp + "/" + shibIdpAttribute);
+
         ShibGroup institutionalGroup = new ShibGroup(name, shibIdpAttribute, shibIdp, groupService.getShibGroupProvider());
         em.persist(institutionalGroup);
         em.flush();
         ShibGroup merged = em.merge(institutionalGroup);
-        
+
         actionLogSvc.log(alr);
         return merged;
     }
-
     public Set findFor(AuthenticatedUser authenticatedUser) {
         Set groupsForUser = new HashSet<>();
         String shibIdp = authenticatedUser.getShibIdentityProvider();
@@ -86,23 +85,24 @@ public Set findFor(AuthenticatedUser authenticatedUser) {
             typedQuery.setParameter("shibIdP", shibIdp);
             List matches = typedQuery.getResultList();
             groupsForUser.addAll(matches);
+            /**
+             * @todo In addition to supporting institution-wide Shibboleth
+             * groups (Harvard, UNC, etc.), allow arbitrary Shibboleth
+             * attributes to be matched (with a regex) such as "memberOf"
+             * etc.
+             */
         }
-        /**
-         * @todo In addition to supporting institution-wide Shibboleth groups
-         * (Harvard, UNC, etc.), allow arbitrary Shibboleth attributes to be
-         * matched (with a regex) such as "memberOf" etc.
-         */
         return groupsForUser;
     }
 
     public boolean delete(ShibGroup doomed) throws Exception {
         ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.GlobalGroups, "shibDelete");
-        alr.setInfo( doomed.getName() + ":" + doomed.getIdentifier() );
-        
+        alr.setInfo(doomed.getName() + ":" + doomed.getIdentifier());
+
         List assignments = roleAssigneeSvc.getAssignmentsFor(doomed.getIdentifier());
         if (assignments.isEmpty()) {
             em.remove(doomed);
-            actionLogSvc.log( alr );
+            actionLogSvc.log(alr);
             return true;
         } else {
             /**
@@ -114,9 +114,9 @@ public boolean delete(ShibGroup doomed) throws Exception {
             }
             String message = "Could not delete Shibboleth group id " + doomed.getId() + " due to existing role assignments: " + assignmentIds;
             logger.info(message);
-            actionLogSvc.log( alr.setActionResult(ActionLogRecord.Result.BadRequest)
-                                 .setInfo( alr.getInfo() + "// " + message ) );
-            
+            actionLogSvc.log(alr.setActionResult(ActionLogRecord.Result.BadRequest)
+                    .setInfo(alr.getInfo() + "// " + message));
+
             throw new Exception(message);
         }
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java
index 7ee037a1876..c9edd04cc1e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProvider.java
@@ -23,8 +23,14 @@
 public class BuiltinAuthenticationProvider implements CredentialsAuthenticationProvider {
     
     public static final String PROVIDER_ID = "builtin";
-    private static String KEY_USERNAME_OR_EMAIL;
-    private static String KEY_PASSWORD;
+    /**
+     * TODO: Think more about if it really makes sense to have the key for a
+     * credential be a Bundle key. What if we want to reorganize our Bundle
+     * files and rename some Bundle keys? Would login be broken until we update
+     * the strings below?
+     */
+    public static final String KEY_USERNAME_OR_EMAIL = "login.builtin.credential.usernameOrEmail";
+    public static final String KEY_PASSWORD = "login.builtin.credential.password";
     private static List CREDENTIALS_LIST;
       
     final BuiltinUserServiceBean bean;
@@ -35,8 +41,6 @@ public BuiltinAuthenticationProvider( BuiltinUserServiceBean aBean, PasswordVali
         this.bean = aBean;
         this.authBean = auBean;
         this.passwordValidatorService = passwordValidatorService;
-        KEY_USERNAME_OR_EMAIL = BundleUtil.getStringFromBundle("login.builtin.credential.usernameOrEmail");
-        KEY_PASSWORD = BundleUtil.getStringFromBundle("login.builtin.credential.password");
         CREDENTIALS_LIST = Arrays.asList(new Credential(KEY_USERNAME_OR_EMAIL), new Credential(KEY_PASSWORD, true));
     }
 
@@ -100,6 +104,9 @@ public AuthenticationResponse authenticate( AuthenticationRequest authReq ) {
         
         if(u == null) { //If can't find by username in builtin, get the auth user and then the builtin
             authUser = authBean.getAuthenticatedUserByEmail(authReq.getCredential(KEY_USERNAME_OR_EMAIL));
+            if (authUser == null) { //if can't find by email return bad username, etc.
+                return AuthenticationResponse.makeFail("Bad username, email address, or password");
+            }
             u = bean.findByUserName(authUser.getUserIdentifier());
         }
         
@@ -123,7 +130,7 @@ public AuthenticationResponse authenticate( AuthenticationRequest authReq ) {
 //        } else {
 //            return AuthenticationResponse.makeSuccess(u.getUserName(), u.getDisplayInfo());
         }
-        final List errors = passwordValidatorService.validate(authReq.getCredential("Password"));
+        final List errors = passwordValidatorService.validate(authReq.getCredential(KEY_PASSWORD));
         if (!errors.isEmpty()) {
             try {
                 String passwordResetUrl = bean.requestPasswordComplianceLink(u);
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
index 4a72fc8a5d7..09096fe5766 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
@@ -338,6 +338,16 @@ public String save() {
                     UserNotification.Type.CREATEACC, null);
 
             // go back to where user came from
+            
+            // (but if they came from the login page, then send them to the 
+            // root dataverse page instead. the only situation where we do 
+            // want to send them back to the login page is if they hit 
+            // 'cancel'. 
+            
+            if ("/loginpage.xhtml".equals(redirectPage) || "loginpage.xhtml".equals(redirectPage)) {
+                redirectPage = "/dataverse.xhtml";
+            }
+            
             if ("dataverse.xhtml".equals(redirectPage)) {
                 redirectPage = redirectPage + "?alias=" + dataverseService.findRootDataverse().getAlias();
             }
@@ -680,4 +690,16 @@ public String getReasonForReturn(DatasetVersion datasetVersion) {
     public String getPasswordRequirements() {
         return passwordValidatorService.getGoodPasswordDescription(passwordErrors);
     }
+    
+    public String getRequestorName(UserNotification notification) {
+        if(notification == null) return BundleUtil.getStringFromBundle("notification.email.info.unavailable");
+        if(notification.getRequestor() == null) return BundleUtil.getStringFromBundle("notification.email.info.unavailable");;
+        return (notification.getRequestor().getLastName() != null && notification.getRequestor().getLastName() != null) ? notification.getRequestor().getFirstName() + " " + notification.getRequestor().getLastName() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");
+    }
+    
+    public String getRequestorEmail(UserNotification notification) {
+        if(notification == null) return BundleUtil.getStringFromBundle("notification.email.info.unavailable");;
+        if(notification.getRequestor() == null) return BundleUtil.getStringFromBundle("notification.email.info.unavailable");;
+        return notification.getRequestor().getEmail() != null ? notification.getRequestor().getEmail() : BundleUtil.getStringFromBundle("notification.email.info.unavailable");
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/echo/EchoAuthenticationProvider.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/echo/EchoAuthenticationProvider.java
index 201f5f2bb02..e638a7bbc48 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/echo/EchoAuthenticationProvider.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/echo/EchoAuthenticationProvider.java
@@ -24,6 +24,9 @@ public class EchoAuthenticationProvider implements CredentialsAuthenticationProv
     private final String prefix;
     private final String postfix;
     private final AuthenticationProviderDisplayInfo info;
+    private final String KEY_NAME = "login.echo.credential.name";
+    private final String KEY_EMAIL = "login.echo.credential.email";
+    private final String KEY_AFFILIATION = "login.echo.credential.affiliation";
     
 
     public EchoAuthenticationProvider(String id, String prefix, String postfix, AuthenticationProviderDisplayInfo someInfo) {
@@ -42,9 +45,9 @@ public EchoAuthenticationProvider(String id) {
     
     @Override
     public List getRequiredCredentials() {
-        return Arrays.asList( new Credential("Name"),
-                              new Credential("Email"),
-                              new Credential("Affiliation") );
+        return Arrays.asList( new Credential(KEY_NAME),
+                              new Credential(KEY_EMAIL),
+                              new Credential(KEY_AFFILIATION) );
     }
 
     @Override
@@ -60,10 +63,10 @@ public AuthenticationProviderDisplayInfo getInfo() {
     @Override
     public AuthenticationResponse authenticate(AuthenticationRequest request) {
         AuthenticatedUserDisplayInfo disinf = new AuthenticatedUserDisplayInfo(
-                prefix + " " + request.getCredential("Name") + " " + postfix,
-                prefix + " " + request.getCredential("Name") + " " + postfix,
-                request.getCredential("Email"),
-                request.getCredential("Affiliation"), 
+                prefix + " " + request.getCredential(KEY_NAME) + " " + postfix,
+                prefix + " " + request.getCredential(KEY_NAME) + " " + postfix,
+                request.getCredential(KEY_EMAIL),
+                request.getCredential(KEY_AFFILIATION), 
                 null);
         return AuthenticationResponse.makeSuccess(disinf.getEmailAddress(), disinf);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
index 6f10dd10632..48258b9c0d3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java
@@ -202,8 +202,8 @@ public String convertExistingAccount() {
         BuiltinAuthenticationProvider biap = new BuiltinAuthenticationProvider(builtinUserSvc, passwordValidatorService, authenticationSvc);
         AuthenticationRequest auReq = new AuthenticationRequest();
         final List creds = biap.getRequiredCredentials();
-        auReq.putCredential(creds.get(0).getTitle(), getUsername());
-        auReq.putCredential(creds.get(1).getTitle(), getPassword());
+        auReq.putCredential(creds.get(0).getKey(), getUsername());
+        auReq.putCredential(creds.get(1).getKey(), getPassword());
         try {
             AuthenticatedUser existingUser = authenticationSvc.getUpdateAuthenticatedUser(BuiltinAuthenticationProvider.PROVIDER_ID, auReq);
             authenticationSvc.updateProvider(existingUser, newUser.getServiceId(), newUser.getIdInService());
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java
index f230522a824..895fe80738e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java
+++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/GitHubOAuth2AP.java
@@ -2,13 +2,13 @@
 
 import com.github.scribejava.apis.GitHubApi;
 import com.github.scribejava.core.builder.api.BaseApi;
-import edu.emory.mathcs.backport.java.util.Collections;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.providers.oauth2.AbstractOAuth2AuthenticationProvider;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUserNameFields;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibUtil;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.StringReader;
+import java.util.Collections;
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java
index 5759c9fc9eb..a627df0dbb3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java
@@ -160,7 +160,7 @@ public static StorageIO performFormatConversion(DataFile file, Storage
         return null;
     }
 
-    private static File downloadFromStorageIO(StorageIO storageIO) {
+    public static File downloadFromStorageIO(StorageIO storageIO) {
         if (storageIO.isLocalFile()){
             try {
                 Path tabFilePath = storageIO.getFileSystemPath();
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
index a18af48cdd0..f273d215a3e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
@@ -146,12 +146,11 @@ public static InputStreamIO getImageThumbnailAsInputStream(StorageIO s
 
         try {
             storageIO.open();
-            Channel cachedThumbnailChannel = storageIO.openAuxChannel(THUMBNAIL_SUFFIX + size);
-            if (cachedThumbnailChannel == null) {
-                logger.warning("Null channel for aux object " + THUMBNAIL_SUFFIX + size);
+            cachedThumbnailInputStream = storageIO.getAuxFileAsInputStream(THUMBNAIL_SUFFIX + size);
+            if (cachedThumbnailInputStream == null) {
+                logger.warning("Null stream for aux object " + THUMBNAIL_SUFFIX + size);
                 return null;
             }
-            cachedThumbnailInputStream = Channels.newInputStream((ReadableByteChannel) cachedThumbnailChannel);
             int cachedThumbnailSize = (int) storageIO.getAuxObjectSize(THUMBNAIL_SUFFIX + size);
 
             InputStreamIO inputStreamIO = new InputStreamIO(cachedThumbnailInputStream, cachedThumbnailSize);
@@ -271,12 +270,12 @@ private static boolean generateImageThumbnail(StorageIO storageIO, int
 
         try {
             storageIO.open();
+            return generateImageThumbnailFromInputStream(storageIO, size, storageIO.getInputStream());
         } catch (IOException ioex) {
             logger.warning("caught IOException trying to open an input stream for " + storageIO.getDataFile().getStorageIdentifier() + ioex);
             return false;
         }
-
-        return generateImageThumbnailFromInputStream(storageIO, size, storageIO.getInputStream());
+        
     }
 
     /*
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
index 530f7ee4a17..e216227f67b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -3,6 +3,7 @@
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.HttpMethod;
 import com.amazonaws.SdkClientException;
+import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.ObjectMetadata;
@@ -12,6 +13,7 @@
 import com.amazonaws.services.s3.model.DeleteObjectsRequest;
 import com.amazonaws.services.s3.model.DeleteObjectsRequest.KeyVersion;
 import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
+import com.amazonaws.services.s3.model.GetObjectMetadataRequest;
 import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
@@ -34,6 +36,7 @@
 import java.net.URLEncoder;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -43,6 +46,8 @@
 import java.util.logging.Logger;
 import org.apache.commons.io.IOUtils;
 
+import javax.validation.constraints.NotNull;
+
 /**
  *
  * @author Matthew A Dunlap
@@ -69,18 +74,49 @@ public S3AccessIO(T dvObject) {
     public S3AccessIO(T dvObject, DataAccessRequest req) {
         super(dvObject, req);
         this.setIsLocalFile(false);
+        
         try {
-            s3 = AmazonS3ClientBuilder.standard().defaultClient();
+            // get a standard client, using the standard way of configuration the credentials, etc.
+            AmazonS3ClientBuilder s3CB = AmazonS3ClientBuilder.standard();
+            // if the admin has set a system property (see below) we use this endpoint URL instead of the standard ones.
+            if (!s3CEUrl.isEmpty()) {
+                s3CB.setEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(s3CEUrl, s3CERegion));
+            }
+            // some custom S3 implementations require "PathStyleAccess" as they us a path, not a subdomain. default = false
+            s3CB.withPathStyleAccessEnabled(s3pathStyleAccess);
+            // let's build the client :-)
+            this.s3 = s3CB.build();
         } catch (Exception e) {
             throw new AmazonClientException(
-                    "Cannot instantiate a S3 client using; check your AWS credentials and region",
-                    e);
+                        "Cannot instantiate a S3 client using; check your AWS credentials and region",
+                        e);
         }
     }
+    
+    public S3AccessIO(T dvObject, DataAccessRequest req, @NotNull AmazonS3 s3client) {
+        super(dvObject, req);
+        this.setIsLocalFile(false);
+        this.s3 = s3client;
+    }
 
     public static String S3_IDENTIFIER_PREFIX = "s3";
     
     private AmazonS3 s3 = null;
+    /**
+     * Pass in a URL pointing to your S3 compatible storage.
+     * For possible values see https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/client/builder/AwsClientBuilder.EndpointConfiguration.html
+     */
+    private String s3CEUrl = System.getProperty("dataverse.files.s3-custom-endpoint-url", "");
+    /**
+     * Pass in a region to use for SigV4 signing of requests.
+     * Defaults to "dataverse" as it is not relevant for custom S3 implementations.
+     */
+    private String s3CERegion = System.getProperty("dataverse.files.s3-custom-endpoint-region", "dataverse");
+    /**
+     * Pass in a boolean value if path style access should be used within the S3 client.
+     * Anything but case-insensitive "true" will lead to value of false, which is default value, too.
+     */
+    private boolean s3pathStyleAccess = Boolean.parseBoolean(System.getProperty("dataverse.files.s3-path-style-access", "false"));
     private String bucketName = System.getProperty("dataverse.files.s3-bucket-name");
     private String key;
 
@@ -123,22 +159,13 @@ public void open(DataAccessOption... options) throws IOException {
 
             if (isReadAccess) {
                 key = getMainFileKey();
-                S3Object s3object = null; 
+                ObjectMetadata objectMetadata = null; 
                 try {
-                    s3object = s3.getObject(new GetObjectRequest(bucketName, key));
+                    objectMetadata = s3.getObjectMetadata(bucketName, key);
                 } catch (SdkClientException sce) {
                     throw new IOException("Cannot get S3 object " + key + " ("+sce.getMessage()+")");
                 }
-                InputStream in = s3object.getObjectContent();
-
-                if (in == null) {
-                    throw new IOException("Cannot get InputStream for S3 Object" + key);
-                }
-
-                this.setInputStream(in);
-
-                setChannel(Channels.newChannel(in));
-                this.setSize(s3object.getObjectMetadata().getContentLength());
+                this.setSize(objectMetadata.getContentLength());
 
                 if (dataFile.getContentType() != null
                         && dataFile.getContentType().equals("text/tab-separated-values")
@@ -181,6 +208,40 @@ public void open(DataAccessOption... options) throws IOException {
         }
     }
 
+    @Override
+    public InputStream getInputStream() throws IOException {
+        if(super.getInputStream()==null) {
+            try {
+                setInputStream(s3.getObject(new GetObjectRequest(bucketName, key)).getObjectContent());
+            } catch (SdkClientException sce) {
+                throw new IOException("Cannot get S3 object " + key + " ("+sce.getMessage()+")");
+            }
+        }
+
+        if (super.getInputStream() == null) {
+            throw new IOException("Cannot get InputStream for S3 Object" + key);
+        }
+
+        setChannel(Channels.newChannel(super.getInputStream()));
+
+        return super.getInputStream();
+    }
+    
+    @Override
+    public Channel getChannel() throws IOException {
+        if(super.getChannel()==null) {
+            getInputStream();
+        }
+        return channel;
+    }
+    
+    @Override
+    public ReadableByteChannel getReadChannel() throws IOException {
+        //Make sure StorageIO.channel variable exists
+        getChannel();
+        return super.getReadChannel();
+    }
+
     // StorageIO method for copying a local Path (for ex., a temp file), into this DataAccess location:
     @Override
     public void savePath(Path fileSystemPath) throws IOException {
@@ -630,7 +691,7 @@ public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException
         }
     }
 
-    private String getDestinationKey(String auxItemTag) throws IOException {
+    String getDestinationKey(String auxItemTag) throws IOException {
         if (dvObject instanceof DataFile) {
             return getMainFileKey() + "." + auxItemTag;
         } else if (dvObject instanceof Dataset) {
@@ -643,7 +704,16 @@ private String getDestinationKey(String auxItemTag) throws IOException {
         }
     }
     
-    private String getMainFileKey() throws IOException {
+    /**
+     * TODO: this function is not side effect free (sets instance variables key and bucketName).
+     *       Is this good or bad? Need to ask @landreev
+     *
+     * Extract the file key from a file stored on S3.
+     * Follows template: "owner authority name"/"owner identifier"/"storage identifier without bucketname and protocol"
+     * @return Main File Key
+     * @throws IOException
+     */
+    String getMainFileKey() throws IOException {
         if (key == null) {
             String baseKey = this.getDataFile().getOwner().getAuthorityForFileStorage() + "/" + this.getDataFile().getOwner().getIdentifierForFileStorage();
             String storageIdentifier = dvObject.getStorageIdentifier();
@@ -723,7 +793,7 @@ public String generateTemporaryS3Url() throws IOException {
         }
     }
     
-    private int getUrlExpirationMinutes() {
+    int getUrlExpirationMinutes() {
         String optionValue = System.getProperty("dataverse.files.s3-url-expiration-minutes"); 
         if (optionValue != null) {
             Integer num; 
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
index fda93b3f557..99eb36d44b0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StorageIO.java
@@ -227,7 +227,7 @@ public boolean canWrite() {
 
     // getters:
     
-    public Channel getChannel() {
+    public Channel getChannel() throws IOException {
         return channel;
     }
 
@@ -276,7 +276,7 @@ public long getSize() {
         return size;
     }
 
-    public InputStream getInputStream() {
+    public InputStream getInputStream() throws IOException {
         return in;
     }
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java
index 2804e7d5cc7..63c067bbf50 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/StoredOriginalFile.java
@@ -60,7 +60,9 @@ public static StorageIO retreive(StorageIO storageIO) {
         try {
             storageIO.open();
             Channel storedOriginalChannel = storageIO.openAuxChannel(SAVED_ORIGINAL_FILENAME_EXTENSION);
-            storedOriginalSize = storageIO.getAuxObjectSize(SAVED_ORIGINAL_FILENAME_EXTENSION);
+            storedOriginalSize = dataFile.getDataTable().getOriginalFileSize() != null ? 
+                    dataFile.getDataTable().getOriginalFileSize() : 
+                    storageIO.getAuxObjectSize(SAVED_ORIGINAL_FILENAME_EXTENSION);
             inputStreamIO = new InputStreamIO(Channels.newInputStream((ReadableByteChannel) storedOriginalChannel), storedOriginalSize);
             logger.fine("Opened stored original file as Aux "+SAVED_ORIGINAL_FILENAME_EXTENSION);
         } catch (IOException ioEx) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
index 6bc5d654dba..0e23a0a3505 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/SwiftAccessIO.java
@@ -518,13 +518,17 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
                 Properties p = getSwiftProperties();
                 swiftEndPoint = p.getProperty("swift.default.endpoint");
 
+                // Swift uses this to create pseudo-hierarchical folders
+                String swiftPseudoFolderPathSeparator = "/";
+
                 //swiftFolderPath = dataFile.getOwner().getDisplayName();
                 String swiftFolderPathSeparator = "-";
                 String authorityNoSlashes = owner.getAuthority().replace("/", swiftFolderPathSeparator);
                 swiftFolderPath = owner.getProtocolForFileStorage() + swiftFolderPathSeparator
-                                  + authorityNoSlashes.replace(".", swiftFolderPathSeparator)
-                                  + swiftFolderPathSeparator + owner.getIdentifierForFileStorage();
-                swiftFileName = storageIdentifier;
+                                  + authorityNoSlashes.replace(".", swiftFolderPathSeparator);
+
+                swiftFileName = owner.getIdentifierForFileStorage() + swiftPseudoFolderPathSeparator
+                                + storageIdentifier;
                 //setSwiftContainerName(swiftFolderPath);
                 //swiftFileName = dataFile.getDisplayName();
                 //Storage Identifier is now updated after the object is uploaded on Swift.
@@ -569,10 +573,14 @@ private StoredObject initializeSwiftFileObject(boolean writeAccess, String auxIt
                 Properties p = getSwiftProperties();
                 swiftEndPoint = p.getProperty("swift.default.endpoint");
                 String swiftFolderPathSeparator = "-";
+
+                // Swift uses this to create pseudo-hierarchical folders
+                String swiftPseudoFolderPathSeparator = "/";
+
                 String authorityNoSlashes = dataset.getAuthorityForFileStorage().replace("/", swiftFolderPathSeparator);
                 swiftFolderPath = dataset.getProtocolForFileStorage() + swiftFolderPathSeparator +
                     authorityNoSlashes.replace(".", swiftFolderPathSeparator) +
-                    swiftFolderPathSeparator + dataset.getIdentifierForFileStorage();
+                    swiftPseudoFolderPathSeparator + dataset.getIdentifierForFileStorage();
 
                 swiftFileName = auxItemTag;
                 dvObject.setStorageIdentifier("swift://" + swiftEndPoint + ":" + swiftFolderPath);
diff --git a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java
index d5a883a15a7..1aa384d205e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtil.java
@@ -3,8 +3,10 @@
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import java.util.Arrays;
 import java.util.logging.Logger;
 import javax.json.Json;
 import javax.json.JsonObject;
@@ -15,11 +17,11 @@ public class DataCaptureModuleUtil {
     private static final Logger logger = Logger.getLogger(DataCaptureModuleUtil.class.getCanonicalName());
 
     public static boolean rsyncSupportEnabled(String uploadMethodsSettings) {
-        logger.fine("uploadMethodsSettings: " + uploadMethodsSettings);
-        if (uploadMethodsSettings != null && SystemConfig.FileUploadMethods.RSYNC.toString().equals(uploadMethodsSettings)) {
-            return true;
-        } else {
+        logger.fine("uploadMethodsSettings: " + uploadMethodsSettings);; 
+        if (uploadMethodsSettings==null){
             return false;
+        } else {
+           return  Arrays.asList(uploadMethodsSettings.toLowerCase().split("\\s*,\\s*")).contains(SystemConfig.FileUploadMethods.RSYNC.toString());
         }
     }
 
@@ -74,4 +76,8 @@ public static String getMessageFromException(DataCaptureModuleException ex) {
         return message + " was caused by " + cause.getMessage();
     }
 
+    public static String getScriptName(DatasetVersion datasetVersion) {
+        return "upload-" + datasetVersion.getDataset().getIdentifier().replace("/", "_") + ".bash";
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
index 9d9a8486675..acbb9211ca1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
@@ -829,9 +829,9 @@ private String getBundleMsg(String msgName, boolean isErr){
             throw new NullPointerException("msgName cannot be null");
         }
         if (isErr){        
-            return ResourceBundle.getBundle("Bundle").getString("file.addreplace.error." + msgName);
+            return BundleUtil.getStringFromBundle("file.addreplace.error." + msgName);
         }else{
-            return ResourceBundle.getBundle("Bundle").getString("file.addreplace.success." + msgName);
+            return BundleUtil.getStringFromBundle("file.addreplace.success." + msgName);
         }
        
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java
index 6b28c6441e8..5c0631d95d6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java
+++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/OptionalFileParams.java
@@ -12,6 +12,8 @@
 import edu.harvard.iq.dataverse.DataFileTag;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.api.Util;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -255,7 +257,7 @@ private void addFileDataTags(List potentialTags) throws DataFileTagExcep
             if (DataFileTag.isDataFileTag(tagToCheck)){
                 this.dataFileTags.add(tagToCheck);
             }else{                    
-                String errMsg = ResourceBundle.getBundle("Bundle").getString("file.addreplace.error.invalid_datafile_tag");
+                String errMsg = BundleUtil.getStringFromBundle("file.addreplace.error.invalid_datafile_tag");
                 throw new DataFileTagException(errMsg + " [" + tagToCheck + "]. Please use one of the following: " + DataFileTag.getListofLabelsAsString());
             }
         }
@@ -361,7 +363,7 @@ private void addFileDataTagsToFile(DataFile df) throws DataFileTagException{
         // Is this a tabular file?
         // --------------------------------------------------
         if (!df.isTabularData()){
-            String errMsg = ResourceBundle.getBundle("Bundle").getString("file.metadata.datafiletag.not_tabular");
+            String errMsg = BundleUtil.getStringFromBundle("file.metadata.datafiletag.not_tabular");
 
             throw new DataFileTagException(errMsg);
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
index 98caf953da6..0b447092482 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java
@@ -15,6 +15,7 @@
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.DvObjectServiceBean;
 import edu.harvard.iq.dataverse.FeaturedDataverseServiceBean;
+import edu.harvard.iq.dataverse.FileDownloadServiceBean;
 import edu.harvard.iq.dataverse.GuestbookResponseServiceBean;
 import edu.harvard.iq.dataverse.GuestbookServiceBean;
 import edu.harvard.iq.dataverse.MapLayerMetadataServiceBean;
@@ -25,10 +26,12 @@
 import edu.harvard.iq.dataverse.TemplateServiceBean;
 import edu.harvard.iq.dataverse.UserNotificationServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleServiceBean;
 import edu.harvard.iq.dataverse.engine.DataverseEngine;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexBatchServiceBean;
 import edu.harvard.iq.dataverse.search.SolrIndexServiceBean;
@@ -97,6 +100,8 @@ public interface CommandContext {
 
     public DOIDataCiteServiceBean doiDataCite();
 
+    public FakePidProviderServiceBean fakePidProvider();
+
     public HandlenetServiceBean handleNet();
 
     public GuestbookServiceBean guestbooks();
@@ -111,6 +116,8 @@ public interface CommandContext {
 
     public ExplicitGroupServiceBean explicitGroups();
 
+    public GroupServiceBean groups();
+
     public UserNotificationServiceBean notifications();
 
     public AuthenticationServiceBean authentication();
@@ -126,4 +133,6 @@ public interface CommandContext {
     public MapLayerMetadataServiceBean mapLayerMetadata();
 
     public DataCaptureModuleServiceBean dataCaptureModule();
+    
+    public FileDownloadServiceBean fileDownload();
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
index 9c521625b48..9ebc816a9cf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
@@ -133,6 +133,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         ctxt.index().indexDataset(theDataset, true);
         ctxt.solrIndex().indexPermissionsOnSelfAndChildren(theDataset.getId());
         
+        /*
         if (DataCaptureModuleUtil.rsyncSupportEnabled(ctxt.settings().getValueForKey(SettingsServiceBean.Key.UploadMethods))) {
             logger.fine("Requesting rsync support.");
             try {
@@ -142,8 +143,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                 logger.log(Level.WARNING, "Problem getting rsync script: {0}", ex.getLocalizedMessage());
             }
             logger.fine("Done with rsync request.");
-        }
-        
+        }*/
         return theDataset;
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
index 775eeecb9b7..062b90bab27 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
@@ -22,6 +22,7 @@
 import static java.util.stream.Collectors.joining;
 import javax.validation.ConstraintViolation;
 import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
 
 /**
  *
@@ -130,6 +131,10 @@ protected void tidyUpFields(DatasetVersion dsv) {
         while (dsfItSort.hasNext()) {
             dsfItSort.next().setValueDisplayOrder();
         }
+        Iterator dsfItTrim = dsv.getDatasetFields().iterator();
+        while (dsfItTrim.hasNext()) {
+            dsfItTrim.next().trimTrailingSpaces();
+        }
     }
 
     /**
@@ -154,6 +159,16 @@ protected void registerExternalIdentifier(Dataset theDataset, CommandContext ctx
         if (!theDataset.isIdentifierRegistered()) {
             GlobalIdServiceBean globalIdServiceBean = GlobalIdServiceBean.getBean(theDataset.getProtocol(), ctxt);
             if ( globalIdServiceBean != null ) {
+                if (globalIdServiceBean instanceof FakePidProviderServiceBean) {
+                    try {
+                        globalIdServiceBean.createIdentifier(theDataset);
+                    } catch (Throwable ex) {
+                        logger.warning("Problem running createIdentifier for FakePidProvider: " + ex);
+                    }
+                    theDataset.setGlobalIdCreateTime(getTimestamp());
+                    theDataset.setIdentifierRegistered(true);
+                    return;
+                }
                 try {
                     if (globalIdServiceBean.alreadyExists(theDataset)) {
                         int attempts = 0;
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractPublishDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractPublishDatasetCommand.java
index 0e9712777a9..40155be6446 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractPublishDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractPublishDatasetCommand.java
@@ -17,8 +17,8 @@ public AbstractPublishDatasetCommand(Dataset datasetIn, DataverseRequest aReques
         super(aRequest, datasetIn);
     }
     
-    protected WorkflowContext buildContext( String doiProvider, WorkflowContext.TriggerType triggerType) {
-        return new WorkflowContext(getRequest(), getDataset(), doiProvider, triggerType);
+    protected WorkflowContext buildContext( Dataset theDataset, WorkflowContext.TriggerType triggerType, boolean datasetExternallyReleased) {
+        return new WorkflowContext(getRequest(), theDataset, triggerType, datasetExternallyReleased);
     }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
index b78c2f316d2..7a352590aac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
@@ -6,6 +6,9 @@
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.RoleAssignment;
 import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.groups.Group;
+import edu.harvard.iq.dataverse.authorization.groups.GroupProvider;
+import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupProvider;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -14,10 +17,14 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * TODO make override the date and user more active, so prevent code errors.
@@ -28,12 +35,14 @@
 @RequiredPermissions(Permission.AddDataverse)
 public class CreateDataverseCommand extends AbstractCommand {
 
+    private static final Logger logger = Logger.getLogger(CreateDataverseCommand.class.getName());
+
     private final Dataverse created;
     private final List inputLevelList;
     private final List facetList;
 
-    public CreateDataverseCommand(Dataverse created,
-            DataverseRequest aRequest, List facetList, List inputLevelList) {
+    public CreateDataverseCommand(Dataverse created, DataverseRequest aRequest, List facetList,
+            List inputLevelList) {
         super(aRequest, created.getOwner());
         this.created = created;
         if (facetList != null) {
@@ -51,7 +60,8 @@ public CreateDataverseCommand(Dataverse created,
     @Override
     public Dataverse execute(CommandContext ctxt) throws CommandException {
 
-        if (created.getOwner() == null) {
+        Dataverse owner = created.getOwner();
+        if (owner == null) {
             if (ctxt.dataverses().isRootDataverseExists()) {
                 throw new IllegalCommandException("Root Dataverse already exists. Cannot create another one", this);
             }
@@ -60,10 +70,10 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
         if (created.getCreateDate() == null) {
             created.setCreateDate(new Timestamp(new Date().getTime()));
         }
-        
+
         if (created.getCreator() == null) {
             final User user = getRequest().getUser();
-            if ( user.isAuthenticated() ) {
+            if (user.isAuthenticated()) {
                 created.setCreator((AuthenticatedUser) user);
             } else {
                 throw new IllegalCommandException("Guest users cannot create a Dataverse.", this);
@@ -73,25 +83,64 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
         if (created.getDataverseType() == null) {
             created.setDataverseType(Dataverse.DataverseType.UNCATEGORIZED);
         }
-        
+
         if (created.getDefaultContributorRole() == null) {
             created.setDefaultContributorRole(ctxt.roles().findBuiltinRoleByAlias(DataverseRole.EDITOR));
         }
-        
+
         // @todo for now we are saying all dataverses are permission root
         created.setPermissionRoot(true);
-        
-        if ( ctxt.dataverses().findByAlias( created.getAlias()) != null ) {
-            throw new IllegalCommandException("A dataverse with alias " + created.getAlias() + " already exists", this );
+
+        if (ctxt.dataverses().findByAlias(created.getAlias()) != null) {
+            throw new IllegalCommandException("A dataverse with alias " + created.getAlias() + " already exists", this);
         }
-        
+
         // Save the dataverse
         Dataverse managedDv = ctxt.dataverses().save(created);
 
         // Find the built in admin role (currently by alias)
         DataverseRole adminRole = ctxt.roles().findBuiltinRoleByAlias(DataverseRole.ADMIN);
         String privateUrlToken = null;
+
         ctxt.roles().save(new RoleAssignment(adminRole, getRequest().getUser(), managedDv, privateUrlToken));
+        // Add additional role assignments if inheritance is set
+        boolean inheritAllRoles = false;
+        String rolesString = ctxt.settings().getValueForKey(SettingsServiceBean.Key.InheritParentRoleAssignments, "");
+        ArrayList rolesToInherit = new ArrayList(Arrays.asList(rolesString.split("\\s*,\\s*")));
+        if (rolesString.length() > 0) {
+            if (!rolesToInherit.isEmpty()) {
+                if (rolesToInherit.contains("*")) {
+                    inheritAllRoles = true;
+                }
+
+                List assignedRoles = ctxt.roles().directRoleAssignments(owner);
+                for (RoleAssignment role : assignedRoles) {
+                    //Only supporting built-in/non-dataverse-specific custom roles. Custom roles all have an owner.
+                    if (role.getRole().getOwner() == null) {
+                        // And... If all roles are to be inherited, or this role is in the list, and, in both
+                        // cases, this is not an admin role for the current user which was just created
+                        // above...
+                        if ((inheritAllRoles || rolesToInherit.contains(role.getRole().getAlias()))
+                                && !(role.getAssigneeIdentifier().equals(getRequest().getUser().getIdentifier())
+                                        && role.getRole().equals(adminRole))) {
+                            String identifier = role.getAssigneeIdentifier();
+                            if (identifier.startsWith(AuthenticatedUser.IDENTIFIER_PREFIX)) {
+                                identifier = identifier.substring(AuthenticatedUser.IDENTIFIER_PREFIX.length());
+                                ctxt.roles().save(new RoleAssignment(role.getRole(),
+                                        ctxt.authentication().getAuthenticatedUser(identifier), managedDv, privateUrlToken));
+                            } else if (identifier.startsWith(Group.IDENTIFIER_PREFIX)) {
+                                identifier = identifier.substring(Group.IDENTIFIER_PREFIX.length());
+                                Group roleGroup = ctxt.groups().getGroup(identifier);
+                                if (roleGroup != null) {
+                                    ctxt.roles().save(new RoleAssignment(role.getRole(),
+                                            roleGroup, managedDv, privateUrlToken));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
         managedDv.setPermissionModificationTime(new Timestamp(new Date().getTime()));
         managedDv = ctxt.dataverses().save(managedDv);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java
index 924de533e6d..ef9f953df01 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDatasetCommand.java
@@ -75,21 +75,23 @@ protected void handlePid(Dataset theDataset, CommandContext ctxt) throws Command
     protected void postPersist( Dataset theDataset, CommandContext ctxt ){
         // set the role to be default contributor role for its dataverse
         String privateUrlToken = null;
-        RoleAssignment roleAssignment = new RoleAssignment(theDataset.getOwner().getDefaultContributorRole(),
-            getRequest().getUser(), theDataset, privateUrlToken);
-        ctxt.roles().save(roleAssignment, false);
-        
-         // TODO: the above may be creating the role assignments and saving them 
-         // in the database, but without properly linking them to the dataset
-         // (saveDataset, that the command returns). This may have been the reason 
-         // for the github issue #4783 - where the users were losing their contributor
-         // permissions, when creating datasets AND uploading files in one step. 
-         // In that scenario, an additional UpdateDatasetCommand is exectued on the
-         // dataset returned by the Create command. That issue was fixed by adding 
-         // a full refresh of the datast with datasetService.find() between the 
-         // two commands. But it may be a good idea to make sure they are properly
-         // linked here (?)
-        theDataset.setPermissionModificationTime(getTimestamp());
+        if (theDataset.getOwner().getDefaultContributorRole() != null) {
+            RoleAssignment roleAssignment = new RoleAssignment(theDataset.getOwner().getDefaultContributorRole(),
+                    getRequest().getUser(), theDataset, privateUrlToken);
+            ctxt.roles().save(roleAssignment, false);
+
+            // TODO: the above may be creating the role assignments and saving them 
+            // in the database, but without properly linking them to the dataset
+            // (saveDataset, that the command returns). This may have been the reason 
+            // for the github issue #4783 - where the users were losing their contributor
+            // permissions, when creating datasets AND uploading files in one step. 
+            // In that scenario, an additional UpdateDatasetCommand is exectued on the
+            // dataset returned by the Create command. That issue was fixed by adding 
+            // a full refresh of the datast with datasetService.find() between the 
+            // two commands. But it may be a good idea to make sure they are properly
+            // linked here (?)
+            theDataset.setPermissionModificationTime(getTimestamp());
+        }
         
         if ( template != null ) {
             ctxt.templates().incrementUsageCount(template.getId());
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
index fd998b47e70..adaadfe8b5c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
@@ -41,19 +41,16 @@ public class FinalizeDatasetPublicationCommand extends AbstractPublishDatasetCom
 
     private static final Logger logger = Logger.getLogger(FinalizeDatasetPublicationCommand.class.getName());
     
-    String doiProvider;
-
     /**
      * mirror field from {@link PublishDatasetCommand} of same name
      */
     final boolean datasetExternallyReleased;
     
-    public FinalizeDatasetPublicationCommand(Dataset aDataset, String aDoiProvider, DataverseRequest aRequest) {
-        this( aDataset, aDoiProvider, aRequest, false );
+    public FinalizeDatasetPublicationCommand(Dataset aDataset, DataverseRequest aRequest) {
+        this( aDataset, aRequest, false );
     }
-    public FinalizeDatasetPublicationCommand(Dataset aDataset, String aDoiProvider, DataverseRequest aRequest, boolean isPidPrePublished) {
+    public FinalizeDatasetPublicationCommand(Dataset aDataset, DataverseRequest aRequest, boolean isPidPrePublished) {
         super(aDataset, aRequest);
-        doiProvider = aDoiProvider;
 	datasetExternallyReleased = isPidPrePublished;
     }
 
@@ -87,7 +84,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         // comes from there. There's a chance that the final merge, at the end of this
         // command, would be sufficient. -- L.A. Sep. 6 2017
         theDataset = ctxt.em().merge(theDataset);
-        
+        setDataset(theDataset);
         updateDatasetUser(ctxt);
         
         //if the publisher hasn't contributed to this version
@@ -105,9 +102,6 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         ctxt.em().merge(ddu);
         
         updateParentDataversesSubjectsField(theDataset, ctxt);
-	if (!datasetExternallyReleased){
-		publicizeExternalIdentifier(theDataset, ctxt);
-	}
 
         PrivateUrl privateUrl = ctxt.engine().submit(new GetPrivateUrlCommand(getRequest(), theDataset));
         if (privateUrl != null) {
@@ -135,9 +129,11 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                     new RemoveLockCommand(getRequest(), theDataset, DatasetLock.Reason.InReview) );
         }
         
+        final Dataset ds = ctxt.em().merge(theDataset);
+        
         ctxt.workflows().getDefaultWorkflow(TriggerType.PostPublishDataset).ifPresent(wf -> {
             try {
-                ctxt.workflows().start(wf, buildContext(doiProvider, TriggerType.PostPublishDataset));
+                ctxt.workflows().start(wf, buildContext(ds, TriggerType.PostPublishDataset, datasetExternallyReleased));
             } catch (CommandException ex) {
                 logger.log(Level.SEVERE, "Error invoking post-publish workflow: " + ex.getMessage(), ex);
             }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseContentCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseContentCommand.java
index 5c465748795..26e1e988fac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseContentCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListDataverseContentCommand.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
-import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.authorization.Permission;
@@ -8,12 +7,12 @@
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
-import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
 import java.util.Collections;
-import java.util.LinkedList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Logger;
 
 /**
  * Lists the content of a dataverse - both datasets and dataverses.
@@ -23,6 +22,7 @@
 // no annotations here, since permissions are dynamically decided
 public class ListDataverseContentCommand extends AbstractCommand> {
 
+    private static final Logger logger = Logger.getLogger(ListDataverseContentCommand.class.getName());
     private final Dataverse dvToList;
 
     public ListDataverseContentCommand(DataverseRequest aRequest, Dataverse anAffectedDataverse) {
@@ -32,21 +32,11 @@ public ListDataverseContentCommand(DataverseRequest aRequest, Dataverse anAffect
 
     @Override
     public List execute(CommandContext ctxt) throws CommandException {
-        LinkedList result = new LinkedList<>();
-        
-        for (Dataset ds : ctxt.datasets().findByOwnerId(dvToList.getId())) {            
-            if (ds.isReleased() || ctxt.permissions().requestOn(getRequest(), ds).has(Permission.ViewUnpublishedDataset)) {
-                result.add(ds);
-            }
+        if (getRequest().getUser().isSuperuser()) {
+            return ctxt.dvObjects().findByOwnerId(dvToList.getId());
+        } else {
+            return ctxt.permissions().whichChildrenHasPermissionsForOrReleased(getRequest(), dvToList, EnumSet.of(Permission.ViewUnpublishedDataverse, Permission.ViewUnpublishedDataset));
         }
-        
-        for (Dataverse dv : ctxt.dataverses().findByOwnerId(dvToList.getId())) {
-            if (dv.isReleased() || ctxt.permissions().requestOn(getRequest(), dv).has(Permission.ViewUnpublishedDataverse)) {
-                result.add(dv);
-            }
-        }
-
-        return result;
     }
 
     @Override
@@ -56,4 +46,4 @@ public Map> getRequiredPermissions() {
                 : Collections.singleton(Permission.ViewUnpublishedDataverse));
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java
index 7db14795f31..9b66b2ba2b5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommand.java
@@ -15,6 +15,7 @@
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissionsMap;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
@@ -29,10 +30,10 @@
  *
  * @author skraffmi
  */
-
-// the permission annotation is open, since this is a superuser-only command - 
-// and that's enforced in the command body:
-@RequiredPermissions({})
+@RequiredPermissionsMap({
+    @RequiredPermissions(dataverseName = "moved", value = {Permission.PublishDataset})
+    ,	@RequiredPermissions(dataverseName = "destination", value = {Permission.AddDataset, Permission.PublishDataset})
+})
 public class MoveDatasetCommand extends AbstractVoidCommand {
 
     private static final Logger logger = Logger.getLogger(MoveDatasetCommand.class.getCanonicalName());
@@ -41,7 +42,11 @@ public class MoveDatasetCommand extends AbstractVoidCommand {
     final Boolean force;
 
     public MoveDatasetCommand(DataverseRequest aRequest, Dataset moved, Dataverse destination, Boolean force) {
-        super(aRequest, moved);
+        super(
+                aRequest,
+                dv("moved", moved),
+                dv("destination", destination)
+        );
         this.moved = moved;
         this.destination = destination;
         this.force= force;
@@ -50,13 +55,10 @@ public MoveDatasetCommand(DataverseRequest aRequest, Dataset moved, Dataverse de
     @Override
     public void executeImpl(CommandContext ctxt) throws CommandException {
         boolean removeGuestbook = false, removeLinkDs = false;
-       // first check if  user is a superuser
-        if ( (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser() ) ) {      
-            throw new PermissionException("Move Dataset can only be called by superusers.",
-                this,  Collections.singleton(Permission.DeleteDatasetDraft), moved);                
+        if (!(getUser() instanceof AuthenticatedUser)) {
+            throw new PermissionException("Move Dataset can only be called by authenticated users.", this, Collections.singleton(Permission.DeleteDatasetDraft), moved);
         }
-        
-        
+
         // validate the move makes sense
         if (moved.getOwner().equals(destination)) {
             throw new IllegalCommandException("Dataset already in this Dataverse ", this);
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java
index 2e4bead7709..f08312658bb 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDataverseCommand.java
@@ -247,8 +247,8 @@ public void executeImpl(CommandContext ctxt) throws CommandException {
         // its destinations owners, remove the link
         logger.info("Checking linked datasets...");
         for (DatasetLinkingDataverse dsld : linkingDatasets) {
-            for (Dataverse owner : ownersToCheck){
-                if ((dsld.getLinkingDataverse()).equals(owner)){
+            for (Dataverse owner : ownersToCheck) {
+                if ((dsld.getLinkingDataverse()).equals(owner)) {
                     if (force == null || !force) {
                         removeLinkDs = true;
                         break;
@@ -259,13 +259,12 @@ public void executeImpl(CommandContext ctxt) throws CommandException {
                 }
             }
         }
-        
-        
+
         if (removeGuestbook || removeTemplate || removeFeatDv || removeMetadataBlock || removeLinkDv || removeLinkDs) {
             StringBuilder errorString = new StringBuilder();
             if (removeGuestbook) {
                 errorString.append("Dataset guestbook is not in target dataverse. ");
-            } 
+            }
             if (removeTemplate) {
                 errorString.append("Dataverse template is not in target dataverse. ");
             } 
@@ -292,6 +291,13 @@ public void executeImpl(CommandContext ctxt) throws CommandException {
         logger.info("Dataverse move took " + (moveDvEnd - moveDvStart) + " milliseconds");
         
         ctxt.indexBatch().indexDataverseRecursively(moved);
-
+        
+        //REindex datasets linked to moved dv
+        if (moved.getDatasetLinkingDataverses() != null &&  !moved.getDatasetLinkingDataverses().isEmpty()) {
+            for (DatasetLinkingDataverse dld : moved.getDatasetLinkingDataverses()) {
+                Dataset linkedDS = ctxt.datasets().find(dld.getDataset().getId());
+                ctxt.index().indexDataset(linkedDS, true);
+            }
+        }
     }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java
index 4433b23cefb..41622507f1b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/PublishDatasetCommand.java
@@ -81,11 +81,11 @@ public PublishDatasetResult execute(CommandContext ctxt) throws CommandException
         }
         
         Optional prePubWf = ctxt.workflows().getDefaultWorkflow(TriggerType.PrePublishDataset);
-        String doiProvider = ctxt.settings().getValueForKey(SettingsServiceBean.Key.DoiProvider, "");
         if ( prePubWf.isPresent() ) {
             // We start a workflow
             theDataset = ctxt.em().merge(theDataset);
-            ctxt.workflows().start(prePubWf.get(), buildContext(doiProvider, TriggerType.PrePublishDataset) );
+            ctxt.em().flush();
+            ctxt.workflows().start(prePubWf.get(), buildContext(theDataset, TriggerType.PrePublishDataset, datasetExternallyReleased));
             return new PublishDatasetResult(theDataset, false);
             
         } else{
@@ -125,7 +125,7 @@ public PublishDatasetResult execute(CommandContext ctxt) throws CommandException
                 
             } else {
                 // Synchronous publishing (no workflow involved)
-                theDataset = ctxt.engine().submit(new FinalizeDatasetPublicationCommand(ctxt.em().merge(theDataset), doiProvider, getRequest(),datasetExternallyReleased));
+                theDataset = ctxt.engine().submit(new FinalizeDatasetPublicationCommand(theDataset, getRequest(),datasetExternallyReleased));
                 return new PublishDatasetResult(theDataset, true);
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java
index 84fbe138e6d..cbc529afe3f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestAccessCommand.java
@@ -12,6 +12,7 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 
 /**
  *
@@ -22,6 +23,7 @@ public class RequestAccessCommand extends AbstractCommand {
     
     private final DataFile file;
     private final AuthenticatedUser requester;
+    private final Boolean sendNotification;
 
 
     public RequestAccessCommand(DataverseRequest dvRequest, DataFile file) {
@@ -29,11 +31,29 @@ public RequestAccessCommand(DataverseRequest dvRequest, DataFile file) {
         super(dvRequest, file);        
         this.file = file;        
         this.requester = (AuthenticatedUser) dvRequest.getUser();
+        this.sendNotification = false;
+    }
+    
+        public RequestAccessCommand(DataverseRequest dvRequest, DataFile file, Boolean sendNotification) {
+        // for data file check permission on owning dataset
+        super(dvRequest, file);        
+        this.file = file;        
+        this.requester = (AuthenticatedUser) dvRequest.getUser();
+        this.sendNotification = sendNotification;
     }
 
     @Override
-    public DataFile execute(CommandContext ctxt) throws CommandException {       
+    public DataFile execute(CommandContext ctxt) throws CommandException {
+        
+       if(!file.getOwner().isFileAccessRequest()){
+            throw new CommandException(BundleUtil.getStringFromBundle("file.requestAccess.notAllowed"), this);
+       }
+        
+        
         file.getFileAccessRequesters().add(requester);
+        if(sendNotification){
+           ctxt.fileDownload().sendRequestFileAccessNotification(this.file.getOwner(), this.file.getId(), requester);
+        }
         return ctxt.files().save(file);
     }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java
index 93cdcb21893..2a6d7216aa5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RequestRsyncScriptCommand.java
@@ -42,10 +42,13 @@ public RequestRsyncScriptCommand(DataverseRequest requestArg, Dataset datasetArg
     }
 
     @Override
-    public ScriptRequestResponse execute(CommandContext ctxt) throws CommandException {
+    public ScriptRequestResponse execute(CommandContext ctxt) throws CommandException {       
         if (request == null) {
             throw new IllegalCommandException("DataverseRequest cannot be null.", this);
         }
+        if(!dataset.getFiles().isEmpty()){
+            throw new IllegalCommandException("Cannot get script for a dataset that already has a file", this);
+        }
         String dcmBaseUrl = ctxt.settings().getValueForKey(DataCaptureModuleUrl);
         if (dcmBaseUrl == null) {
             throw new RuntimeException(DataCaptureModuleUrl + " is null!");
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java
index 8cad66ccc42..16fa40cd8a7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommand.java
@@ -50,56 +50,41 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
         if (publicInstall) {
             throw new CommandExecutionException("Restricting files is not permitted on a public installation.", this);
         }
-        if (file.getOwner() == null){
+        // check if this file is already restricted or already unrestricted
+        if (restrict == file.getFileMetadata().isRestricted()) {
+            String text = restrict ? "restricted" : "unrestricted";
+            throw new CommandExecutionException("File " + file.getDisplayName() + " is already " + text, this);
+        }
+        // At present 4.9.4, it doesn't appear that new files use this command, so owner should always be set...
+        if (file.getOwner() == null) {
             // this is a new file through upload, restrict
             file.getFileMetadata().setRestricted(restrict);
-            file.setRestricted(restrict); 
+            file.setRestricted(restrict);
         }
-        
         else {
             Dataset dataset = file.getOwner();
             DatasetVersion workingVersion = dataset.getEditVersion();
-
-            // check if this file is already restricted or already unrestricted
-            if ((restrict && file.getFileMetadata().isRestricted()) || (!restrict  && !file.getFileMetadata().isRestricted())) {
-                String text =  restrict ? "restricted" : "unrestricted";
-                throw new CommandExecutionException("File " + file.getDisplayName() + " is already " + text, this);
-            }
-
-            // check if this dataset is a draft (should be), then we can update restrict
-            if (workingVersion.isDraft()) {
-                // required for updating from a published version to a draft
-                // because we must update the working version metadata
-                if (dataset.isReleased()){
-                    for (FileMetadata fmw : workingVersion.getFileMetadatas()) {
-                        if (file.equals(fmw.getDataFile())) {
-                            fmw.setRestricted(restrict);
-                            if (!file.isReleased()) {
-                                file.setRestricted(restrict); 
-                            }
-
-                        }
-
-                    }
-                }
-                else {
-                    file.getFileMetadata().setRestricted(restrict);
-                    if (!file.isReleased()) {
-                        file.setRestricted(restrict);
-                    }
-                    if (file.getFileMetadata().isRestricted() != restrict) {
-                        throw new CommandExecutionException("Failed to update the file metadata", this);
+            // We need the FileMetadata for the file in the draft dataset version and the
+            // file we have may still reference the fmd from the prior released version
+            FileMetadata draftFmd = file.getFileMetadata();
+            if (dataset.isReleased()) {
+                // We want to update the draft version, which may not exist (if the file has
+                // been deleted from an existing draft, so we want null unless this file's
+                // metadata can be found in the current version
+                draftFmd=null;
+                for (FileMetadata fmw : workingVersion.getFileMetadatas()) {
+                    if (file.equals(fmw.getDataFile())) {
+                        draftFmd = fmw;
+                        break;
                     }
                 }
             }
-            else{
-                throw new CommandExecutionException("Working version must be a draft", this);
+            if (draftFmd != null) {
+                draftFmd.setRestricted(restrict);
+                if (!file.isReleased()) {
+                    file.setRestricted(restrict);
+                }
             }
-
-
         }
-   
     }
-
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java
index 29de81c4171..78734521a82 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SubmitDatasetForReviewCommand.java
@@ -53,10 +53,12 @@ public Dataset save(CommandContext ctxt) throws CommandException {
         ctxt.em().flush();
 
         updateDatasetUser(ctxt);
+
+        AuthenticatedUser requestor = getUser().isAuthenticated() ? (AuthenticatedUser) getUser() : null;
         
         List authUsers = ctxt.permissions().getUsersWithPermissionOn(Permission.PublishDataset, savedDataset);
         for (AuthenticatedUser au : authUsers) {
-            ctxt.notifications().sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.SUBMITTEDDS, savedDataset.getLatestVersion().getId());
+            ctxt.notifications().sendNotification(au, new Timestamp(new Date().getTime()), UserNotification.Type.SUBMITTEDDS, savedDataset.getLatestVersion().getId(), "", requestor);
         }
         
         //  TODO: What should we do with the indexing result? Print it to the log?
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java
index 153ad0024a7..cf410d24008 100644
--- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseCommand.java
@@ -1,7 +1,9 @@
 package edu.harvard.iq.dataverse.engine.command.impl;
 
+import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.Dataverse.DataverseType;
 import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevel;
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
@@ -11,6 +13,7 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import java.util.ArrayList;
 import java.util.List;
+import javax.persistence.TypedQuery;
 
 /**
  * Update an existing dataverse.
@@ -26,56 +29,69 @@ public class UpdateDataverseCommand extends AbstractCommand {
 
 	public UpdateDataverseCommand(Dataverse editedDv, List facetList, List featuredDataverseList, 
                     DataverseRequest aRequest,  List inputLevelList ) {
-		super(aRequest, editedDv);
-		this.editedDv = editedDv;
-                // add update template uses this command but does not
-                // update facet list or featured dataverses
-                if (facetList != null){
-                   this.facetList = new ArrayList<>(facetList); 
-                } else {
-                   this.facetList = null;
-                }
-		if (featuredDataverseList != null){
-                    this.featuredDataverseList = new ArrayList<>(featuredDataverseList);
-                } else {
-                    this.featuredDataverseList = null;
-                }
-                if (inputLevelList != null){
-                   this.inputLevelList = new ArrayList<>(inputLevelList); 
-                } else {
-                   this.inputLevelList = null;
-                }
+            super(aRequest, editedDv);
+            this.editedDv = editedDv;
+            // add update template uses this command but does not
+            // update facet list or featured dataverses
+            if (facetList != null){
+               this.facetList = new ArrayList<>(facetList); 
+            } else {
+               this.facetList = null;
+            }
+            if (featuredDataverseList != null){
+                this.featuredDataverseList = new ArrayList<>(featuredDataverseList);
+            } else {
+                this.featuredDataverseList = null;
+            }
+            if (inputLevelList != null){
+               this.inputLevelList = new ArrayList<>(inputLevelList); 
+            } else {
+               this.inputLevelList = null;
+            }
 	}
 	
 	@Override
 	public Dataverse execute(CommandContext ctxt) throws CommandException {
-		
-		Dataverse result = ctxt.dataverses().save(editedDv);
-		
-        if ( facetList != null ) {
-            ctxt.facets().deleteFacetsFor(result);
-            int i=0;
-            for ( DatasetFieldType df : facetList ) {
-                ctxt.facets().create(i++, df.getId(), result.getId());
+            DataverseType oldDvType = ctxt.dataverses().find(editedDv.getId()).getDataverseType();
+            String oldDvAlias = ctxt.dataverses().find(editedDv.getId()).getAlias();
+            String oldDvName = ctxt.dataverses().find(editedDv.getId()).getName();
+            Dataverse result = ctxt.dataverses().save(editedDv);
+            
+            if ( facetList != null ) {
+                ctxt.facets().deleteFacetsFor(result);
+                int i=0;
+                for ( DatasetFieldType df : facetList ) {
+                    ctxt.facets().create(i++, df.getId(), result.getId());
+                }
             }
-        }
-        if ( featuredDataverseList != null ) {
-            ctxt.featuredDataverses().deleteFeaturedDataversesFor(result);
-            int i=0;
-            for ( Object obj : featuredDataverseList ) {
-                Dataverse dv = (Dataverse) obj;
-                ctxt.featuredDataverses().create(i++, dv.getId(), result.getId());
+            if ( featuredDataverseList != null ) {
+                ctxt.featuredDataverses().deleteFeaturedDataversesFor(result);
+                int i=0;
+                for ( Object obj : featuredDataverseList ) {
+                    Dataverse dv = (Dataverse) obj;
+                    ctxt.featuredDataverses().create(i++, dv.getId(), result.getId());
+                }
             }
-        }
-        if ( inputLevelList != null ) {
-            ctxt.fieldTypeInputLevels().deleteFacetsFor(result);
-            for ( DataverseFieldTypeInputLevel obj : inputLevelList ) {               
-                ctxt.fieldTypeInputLevels().create(obj);
+            if ( inputLevelList != null ) {
+                ctxt.fieldTypeInputLevels().deleteFacetsFor(result);
+                for ( DataverseFieldTypeInputLevel obj : inputLevelList ) {               
+                    ctxt.fieldTypeInputLevels().create(obj);
+                }
             }
-        }
-		ctxt.index().indexDataverse(result);
-		
-        return result;
+            
+            ctxt.index().indexDataverse(result);
+            
+            //When these values are changed we need to reindex all children datasets
+            //This check is not recursive as all the values just report the immediate parent
+            //
+            //This runs async to not slow down editing --MAD 4.9.4
+            if(!oldDvType.equals(editedDv.getDataverseType()) 
+            || !oldDvName.equals(editedDv.getName())
+            || !oldDvAlias.equals(editedDv.getAlias())) {
+                List datasets = ctxt.datasets().findByOwnerId(editedDv.getId());
+                ctxt.index().asyncIndexDatasetList(datasets, true);
+            }
+            
+            return result;
 	}
-	
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java
new file mode 100644
index 00000000000..e36fe06b863
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java
@@ -0,0 +1,71 @@
+package edu.harvard.iq.dataverse.engine.command.impl;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.GlobalIdServiceBean;
+import edu.harvard.iq.dataverse.authorization.Permission;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.AbstractVoidCommand;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
+import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.sql.Timestamp;
+import java.util.Collections;
+import java.util.Date;
+
+/**
+ *
+ * @author skraffmi
+ * No required permissions because we are enforcing super user status in the execute
+ */
+@RequiredPermissions({})
+public class UpdateDvObjectPIDMetadataCommand extends AbstractVoidCommand {
+
+    private final Dataset target;
+
+    public UpdateDvObjectPIDMetadataCommand(Dataset target, DataverseRequest aRequest) {
+        super(aRequest, target);
+        this.target = target;
+    }
+
+    @Override
+    protected void executeImpl(CommandContext ctxt) throws CommandException {
+
+
+        if (!(getUser() instanceof AuthenticatedUser) || !getUser().isSuperuser()) {
+            throw new PermissionException(BundleUtil.getStringFromBundle("datasets.api.updatePIDMetadata.auth.mustBeSuperUser"),
+                    this, Collections.singleton(Permission.EditDataset), target);
+        }
+        if (!this.target.isReleased()){
+            //This is for the bulk update version of the api.
+            //We don't want to modify drafts, but we want it to keep going
+            //the single dataset update api checks for drafts before calling the command
+            return;
+        }
+        GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(target.getProtocol(), ctxt);
+        try {
+            Boolean doiRetString = idServiceBean.publicizeIdentifier(target);
+            if (doiRetString) {
+                target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
+                ctxt.em().merge(target);
+                ctxt.em().flush();
+                for (DataFile df : target.getFiles()) {
+                    doiRetString = idServiceBean.publicizeIdentifier(df);
+                    if (doiRetString) {
+                        df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
+                        ctxt.em().merge(df);
+                        ctxt.em().flush();
+                    }
+                }
+            } else {
+                //do nothing - we'll know it failed because the global id create time won't have been updated.
+            }
+        } catch (Exception e) {
+            //do nothing - item and the problem has been logged
+        }
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java
index 1794650a723..9718841ed4e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DDIExportServiceBean.java
@@ -12,18 +12,27 @@
 import edu.harvard.iq.dataverse.DataFileServiceBean;
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.dataaccess.DataConverter;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
+import edu.harvard.iq.dataverse.dataaccess.TabularSubsetGenerator;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.datavariable.VariableRange;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
 import edu.harvard.iq.dataverse.datavariable.SummaryStatistic;
 import edu.harvard.iq.dataverse.datavariable.VariableCategory;
+import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Collection;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.ArrayList;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import javax.ejb.Stateless;
 import javax.inject.Named;
 import javax.ejb.EJB;
@@ -62,6 +71,9 @@ public class DDIExportServiceBean {
     @EJB
     VariableServiceBean variableService;
 
+    @EJB
+    IngestServiceBean ingestService;
+
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
 
@@ -419,6 +431,11 @@ private void createDataFileDDI(XMLStreamWriter xmlw, Set excludedFieldSe
 
         if (checkField("var", excludedFieldSet, includedFieldSet)) {
             List vars = variableService.findByDataTableId(dt.getId());
+            if (checkField("catgry", excludedFieldSet, includedFieldSet)) {
+                if (checkIsWithoutFrequencies(vars)) {
+                    calculateFrequencies(df, vars);
+                }
+            }
 
             for (DataVariable var : vars) {
                 createVarDDI(xmlw, excludedFieldSet, null, var);
@@ -429,6 +446,40 @@ private void createDataFileDDI(XMLStreamWriter xmlw, Set excludedFieldSe
         xmlw.writeEndElement(); // codeBook
 
     }
+
+    private boolean checkIsWithoutFrequencies(List vars) {
+        boolean IsWithoutFrequencies = true;
+        boolean found = false;
+        for (DataVariable dv : vars) {
+            for (VariableCategory cat : dv.getCategories()) {
+                found = true;
+                if (cat.getFrequency() == null) {
+                    IsWithoutFrequencies = true;
+                } else {
+                    IsWithoutFrequencies = false;
+                }
+                break;
+            }
+            if (found)
+                break;
+        }
+        return IsWithoutFrequencies;
+    }
+
+    private void calculateFrequencies(DataFile df, List vars)
+    {
+        try {
+            DataConverter dc = new DataConverter();
+            File tabFile = dc.downloadFromStorageIO(df.getStorageIO());
+
+            ingestService.produceFrequencies(tabFile, vars );
+
+        } catch (Exception ex)
+        {
+            logger.warning(ex.getMessage());
+            return;
+        }
+    }
     
     private void createDatasetDDI(XMLStreamWriter xmlw, Set excludedFieldSet, Set includedFieldSet, DatasetVersion version) throws XMLStreamException {
         
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java
index 6ab3ba31391..a029e483c0c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java
@@ -6,9 +6,7 @@
 import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
 import edu.harvard.iq.dataverse.export.spi.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.OutputStream;
-import javax.ejb.EJB;
 import javax.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
@@ -44,9 +42,9 @@ public String getDisplayName() {
     @Override
     public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException {
         try {
-		XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
-		xmlw.writeStartDocument();
-		xmlw.flush();
+        XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream);
+        xmlw.writeStartDocument();
+        xmlw.flush();
             DdiExportUtil.datasetJson2ddi(json, version, outputStream);
         } catch (XMLStreamException xse) {
             throw new ExportException ("Caught XMLStreamException performing DDI export");
@@ -74,17 +72,17 @@ public Boolean isAvailableToUsers() {
     
     @Override
     public String getXMLNameSpace() throws ExportException {
-        return this.DEFAULT_XML_NAMESPACE;   
+        return DDIExporter.DEFAULT_XML_NAMESPACE;   
     }
     
     @Override
     public String getXMLSchemaLocation() throws ExportException {
-        return this.DEFAULT_XML_SCHEMALOCATION;
+        return DDIExporter.DEFAULT_XML_SCHEMALOCATION;
     }
     
     @Override
     public String getXMLSchemaVersion() throws ExportException {
-        return this.DEFAULT_XML_VERSION;
+        return DDIExporter.DEFAULT_XML_VERSION;
     }
     
     @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java
new file mode 100644
index 00000000000..7110067296d
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java
@@ -0,0 +1,91 @@
+
+package edu.harvard.iq.dataverse.export;
+
+import com.google.auto.service.AutoService;
+
+import edu.harvard.iq.dataverse.DOIDataCiteRegisterService;
+import edu.harvard.iq.dataverse.DataCitation;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.export.spi.Exporter;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.Map;
+import javax.json.JsonObject;
+
+/**
+ *
+ * @author qqmyers
+ */
+@AutoService(Exporter.class)
+public class DataCiteExporter implements Exporter {
+
+    private static String DEFAULT_XML_NAMESPACE = "http://datacite.org/schema/kernel-3";
+    private static String DEFAULT_XML_SCHEMALOCATION = "http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd";
+    private static String DEFAULT_XML_VERSION = "3.0";
+
+    public static final String NAME = "Datacite";
+    @Override
+    public String getProviderName() {
+        return NAME;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.datacite") != null
+                ? BundleUtil.getStringFromBundle("dataset.exportBtn.itemLabel.datacite")
+                : "DataCite";
+    }
+
+    @Override
+    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream)
+            throws ExportException {
+        try {
+            DataCitation dc = new DataCitation(version);
+            
+            Map metadata = dc.getDataCiteMetadata();
+            String xml = DOIDataCiteRegisterService.getMetadataFromDvObject(
+                    version.getDataset().getGlobalId().asString(), metadata, version.getDataset());
+            outputStream.write(xml.getBytes(Charset.forName("utf-8")));
+        } catch (IOException e) {
+            throw new ExportException("Caught IOException performing DataCite export");
+        }
+    }
+
+    @Override
+    public Boolean isXMLFormat() {
+        return true;
+    }
+
+    @Override
+    public Boolean isHarvestable() {
+        return true;
+    }
+
+    @Override
+    public Boolean isAvailableToUsers() {
+        return true;
+    }
+
+    @Override
+    public String getXMLNameSpace() throws ExportException {
+        return DataCiteExporter.DEFAULT_XML_NAMESPACE;
+    }
+
+    @Override
+    public String getXMLSchemaLocation() throws ExportException {
+        return DataCiteExporter.DEFAULT_XML_SCHEMALOCATION;
+    }
+
+    @Override
+    public String getXMLSchemaVersion() throws ExportException {
+        return DataCiteExporter.DEFAULT_XML_VERSION;
+    }
+
+    @Override
+    public void setParam(String name, Object value) {
+        // this exporter does not uses or supports any parameters as of now.
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java b/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
index d9a7900f907..59c3c20c5ac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
@@ -2,20 +2,16 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.DvObject;
 import static edu.harvard.iq.dataverse.GlobalIdServiceBean.logger;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
 import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
 import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
 import edu.harvard.iq.dataverse.dataaccess.StorageIO;
-import static edu.harvard.iq.dataverse.dataset.DatasetUtil.datasetLogoThumbnail;
-import static edu.harvard.iq.dataverse.dataset.DatasetUtil.thumb48addedByImageThumbConverter;
 import edu.harvard.iq.dataverse.export.spi.Exporter;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,7 +20,6 @@
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
@@ -38,6 +33,8 @@
 import java.util.logging.Logger;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -68,6 +65,8 @@ public static synchronized ExportService getInstance() {
 
     public static synchronized ExportService getInstance(SettingsServiceBean settingsService) {
         ExportService.settingsService = settingsService;
+        // We pass settingsService into the JsonPrinter so it can check the :ExcludeEmailFromExport setting in calls to JsonPrinter.jsonAsDatasetDto().
+        JsonPrinter.setSettingsService(settingsService);
         if (service == null) {
             service = new ExportService();
         }
@@ -155,10 +154,10 @@ public void exportAllFormats(Dataset dataset) throws ExportException {
         try {
             DatasetVersion releasedVersion = dataset.getReleasedVersion();
             if (releasedVersion == null) {
-                throw new ExportException("No released version for dataset " + dataset.getGlobalIdString());
+                throw new ExportException("No released version for dataset " + dataset.getGlobalId().toString());
             }
-            JsonPrinter jsonPrinter = new JsonPrinter(settingsService);
-            final JsonObjectBuilder datasetAsJsonBuilder = jsonPrinter.jsonAsDatasetDto(releasedVersion);
+
+            final JsonObjectBuilder datasetAsJsonBuilder = JsonPrinter.jsonAsDatasetDto(releasedVersion);
             JsonObject datasetAsJson = datasetAsJsonBuilder.build();
 
             Iterator exporters = loader.iterator();
@@ -209,17 +208,17 @@ public void exportFormat(Dataset dataset, String formatName) throws ExportExcept
                     if (releasedVersion == null) {
                         throw new IllegalStateException("No Released Version");
                     }
-                    JsonPrinter jsonPrinter = new JsonPrinter(settingsService);
-                    final JsonObjectBuilder datasetAsJsonBuilder = jsonPrinter.jsonAsDatasetDto(releasedVersion);
+                    final JsonObjectBuilder datasetAsJsonBuilder = JsonPrinter.jsonAsDatasetDto(releasedVersion);
                     cacheExport(releasedVersion, formatName, datasetAsJsonBuilder.build(), e);
                 }
             }
         } catch (ServiceConfigurationError serviceError) {
             throw new ExportException("Service configuration error during export. " + serviceError.getMessage());
         } catch (IllegalStateException e) {
-            throw new ExportException("No published version found during export. " + dataset.getGlobalIdString());
+            throw new ExportException("No published version found during export. " + dataset.getGlobalId().toString());
         }
     }
+    
 
     public Exporter getExporter(String formatName) throws ExportException {
         try {
@@ -365,4 +364,19 @@ public Boolean isXMLFormat(String provider) {
         return null;
     }
 
+	public String getMediaType(String provider) {
+		 try {
+	            Iterator exporters = loader.iterator();
+	            while (exporters.hasNext()) {
+	                Exporter e = exporters.next();
+	                if (e.getProviderName().equals(provider)) {
+	                    return e.getMediaType();
+	                }
+	            }
+	        } catch (ServiceConfigurationError serviceError) {
+	            serviceError.printStackTrace();
+	        }
+	        return MediaType.TEXT_PLAIN;
+	}
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java
index 03d04ca8116..0c87e02456d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/JSONExporter.java
@@ -6,9 +6,8 @@
 import edu.harvard.iq.dataverse.export.spi.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import javax.json.JsonObject;
+import javax.ws.rs.core.MediaType;
 
 
 /**
@@ -73,4 +72,9 @@ public void setParam(String name, Object value) {
         // this exporter doesn't need/doesn't currently take any parameters
     }
     
+    @Override
+    public String getMediaType() {
+        return MediaType.APPLICATION_JSON;
+    }
+    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java
index eafe3daf726..b43fbd3e06d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java
@@ -6,9 +6,7 @@
 import edu.harvard.iq.dataverse.export.ddi.DdiExportUtil;
 import edu.harvard.iq.dataverse.export.spi.Exporter;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.OutputStream;
-import javax.ejb.EJB;
 import javax.json.JsonObject;
 import javax.xml.stream.XMLStreamException;
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java
new file mode 100644
index 00000000000..79a86f08f72
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java
@@ -0,0 +1,87 @@
+package edu.harvard.iq.dataverse.export;
+
+import com.google.auto.service.AutoService;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.export.spi.Exporter;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.export.ExportException;
+import edu.harvard.iq.dataverse.util.bagit.OREMap;
+import java.io.OutputStream;
+import java.util.ResourceBundle;
+import java.util.logging.Logger;
+
+import javax.json.JsonObject;
+import javax.ws.rs.core.MediaType;
+
+@AutoService(Exporter.class)
+public class OAI_OREExporter implements Exporter {
+
+    private static final Logger logger = Logger.getLogger(OAI_OREExporter.class.getCanonicalName());
+
+    public static final String NAME = "OAI_ORE";
+
+    @Override
+    public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream)
+            throws ExportException {
+        try {
+            new OREMap(version, ExportService.settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false)).writeOREMap(outputStream);
+        } catch (Exception e) {
+            logger.severe(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+
+    @Override
+    public String getProviderName() {
+        return NAME;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return ResourceBundle.getBundle("Bundle").getString("dataset.exportBtn.itemLabel.oai_ore") != null
+                ? ResourceBundle.getBundle("Bundle").getString("dataset.exportBtn.itemLabel.oai_ore")
+                : "OAI_ORE";
+    }
+
+    @Override
+    public Boolean isXMLFormat() {
+        return false;
+    }
+
+    @Override
+    public Boolean isHarvestable() {
+        return false;
+    }
+
+    @Override
+    public Boolean isAvailableToUsers() {
+        return true;
+    }
+
+    @Override
+    public String getXMLNameSpace() throws ExportException {
+        throw new ExportException(OAI_OREExporter.class.getSimpleName() + ": not an XML format.");
+    }
+
+    @Override
+    public String getXMLSchemaLocation() throws ExportException {
+        throw new ExportException(OAI_OREExporter.class.getSimpleName() + ": not an XML format.");
+    }
+
+    @Override
+    public String getXMLSchemaVersion() throws ExportException {
+        throw new ExportException(SchemaDotOrgExporter.class.getSimpleName() + ": not an XML format.");
+    }
+
+    @Override
+    public void setParam(String name, Object value) {
+        // this exporter doesn't need/doesn't currently take any parameters
+    }
+    
+    @Override
+    public String getMediaType() {
+        return MediaType.APPLICATION_JSON;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java
index 98f46306faa..971f0e5afa5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporter.java
@@ -11,7 +11,62 @@
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
+import javax.ws.rs.core.MediaType;
 
+/**
+ * Schema.org JSON-LD is used by Google Dataset Search and other services to
+ * make datasets more discoverable. It is embedded in the HTML of dataset pages
+ * and available as an export format.
+ * 
        
+ * Do not make any backward incompatible changes unless it's absolutely
+ * necessary and list them in the API Guide. The existing list is in the
+ * "Native API" section.
+ * 
        
+ * {@link SchemaDotOrgExporterTest} has most of the tests but
+ * {@link DatasetVersionTest} has some as well. See
+ * https://schema.org/docs/gs.html#schemaorg_expected for some discussion on
+ * what a flexible format Schema.org JSON-LD. Use of tools such as
+ * https://search.google.com/structured-data/testing-tool and
+ * https://webmaster.yandex.com/tools/microtest/ and
+ * http://linter.structured-data.org to make sure Dataverse continues to emit
+ * valid output is encouraged but you will find that these tools (and the
+ * underlying spec) can be extremely accommodating to fairly radical
+ * restructuring of the JSON output. Strings can become objects or arrays, for
+ * example, and Honey Badger don't care. Because we expect API users will make
+ * use of the JSON output, you should not change it or you will break their
+ * code.
+ * 
        
+ * Copying and pasting output into
+ * https://search.google.com/structured-data/testing-tool to make sure it's
+ * still valid can get tedious but we are not aware of a better way. We looked
+ * at https://github.com/jessedc/ajv-cli (doesn't support JSON-LD, always
+ * reports "valid"), https://github.com/jsonld-java/jsonld-java and
+ * https://github.com/jsonld-java/jsonld-java-tools (unclear if they support
+ * validation), https://github.com/structured-data/linter (couldn't get it
+ * installed), https://github.com/json-ld/json-ld.org (couldn't get the test
+ * suite to detect changes) , https://tech.yandex.com/validator/ (requires API
+ * key),
+ * https://packagist.org/packages/padosoft/laravel-google-structured-data-testing-tool
+ * (may be promising). We use https://github.com/everit-org/json-schema in our
+ * app already to validate JSON Schema but JSON-LD is a different animal.
+ * https://schema.org/Dataset.jsonld appears to be the way to download just the
+ * "Dataset" definition ( https://schema.org/Dataset ) from schema.org but the
+ * official way to download these definitions is from
+ * https://schema.org/docs/developers.html#defs . Despite all this
+ * experimentation (some of these tools were found at
+ * https://medium.com/@vilcins/structured-data-markup-validation-and-testing-tools-1968bd5dea37
+ * ), the accepted answer at
+ * https://webmasters.stackexchange.com/questions/56577/any-way-to-validate-schema-org-json-ld-before-publishing
+ * is to just copy and paste your output into one of the online tools so for
+ * now, just do that.
+ * 
        
+ * Google provides a Schema.org JSON-LD example at
+ * https://developers.google.com/search/docs/data-types/dataset but we've also
+ * looked at examples from
+ * https://zenodo.org/record/1419226/export/schemaorg_jsonld#.W9NJjicpDUI ,
+ * https://www.icpsr.umich.edu/icpsrweb/ICPSR/studies/23980/export , and
+ * https://doi.pangaea.de/10.1594/PANGAEA.884619
+ */
 @AutoService(Exporter.class)
 public class SchemaDotOrgExporter implements Exporter {
 
@@ -82,5 +137,11 @@ public String getXMLSchemaVersion() throws ExportException {
     public void setParam(String name, Object value) {
         // this exporter doesn't need/doesn't currently take any parameters
     }
+    
+
+    @Override
+    public String getMediaType() {
+        return MediaType.APPLICATION_JSON;
+    }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java b/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java
index 9deda7b0047..e44265946f6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/export/spi/Exporter.java
@@ -9,6 +9,7 @@
 import edu.harvard.iq.dataverse.export.ExportException;
 import java.io.OutputStream;
 import javax.json.JsonObject;
+import javax.ws.rs.core.MediaType;
 
 /**
  *
@@ -43,5 +44,9 @@ but NOT close() it!
     public String getXMLSchemaVersion() throws ExportException; 
     
     public void setParam(String name, Object value);
+
+	public default String getMediaType() {
+	    return MediaType.APPLICATION_XML;
+	};
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java
index 0fc38a27011..e4642fe0a4d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/oai/OaiHandler.java
@@ -23,6 +23,8 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.lang.StringUtils;
 import org.xml.sax.SAXException;
 import javax.xml.transform.TransformerException;
 import java.net.URLEncoder;
@@ -30,7 +32,6 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java
index 447d97ee80a..05d34250fd6 100644
--- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java
+++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java
@@ -39,6 +39,8 @@
 import edu.harvard.iq.dataverse.harvest.server.xoai.XlistRecords;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import org.apache.commons.lang.StringUtils;
+
 import java.io.ByteArrayOutputStream;
 
 import java.io.IOException;
@@ -57,7 +59,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamException;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  *
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
index 59ef459b306..ac411d5e6bd 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -21,6 +21,7 @@
 package edu.harvard.iq.dataverse.ingest;
 
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.datavariable.VariableCategory;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.Dataset;
@@ -92,6 +93,7 @@
 import java.util.Comparator;
 import java.util.ListIterator;
 import java.util.logging.Logger;
+import java.util.Hashtable;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.inject.Named;
@@ -625,6 +627,69 @@ public void produceCharacterSummaryStatistics(DataFile dataFile, File generatedT
             }
         }
     }
+
+    public static void produceFrequencyStatistics(DataFile dataFile, File generatedTabularFile) throws IOException {
+
+        List vars = dataFile.getDataTable().getDataVariables();
+
+        produceFrequencies(generatedTabularFile, vars);
+    }
+
+    public static void produceFrequencies( File generatedTabularFile, List vars) throws IOException {
+
+        for (int i = 0; i < vars.size(); i++) {
+
+            Collection cats = vars.get(i).getCategories();
+            int caseQuantity = vars.get(i).getDataTable().getCaseQuantity().intValue();
+            boolean isNumeric = vars.get(i).isTypeNumeric();
+            Object[] variableVector = null;
+            if (cats.size() > 0) {
+                if (isNumeric) {
+                    variableVector = TabularSubsetGenerator.subsetFloatVector(new FileInputStream(generatedTabularFile), i, caseQuantity);
+                }
+                else {
+                    variableVector = TabularSubsetGenerator.subsetStringVector(new FileInputStream(generatedTabularFile), i, caseQuantity);
+                }
+                if (variableVector != null) {
+                    Hashtable freq = calculateFrequency(variableVector);
+                    for (VariableCategory cat : cats) {
+                        Object catValue;
+                        if (isNumeric) {
+                            catValue = new Float(cat.getValue());
+                        } else {
+                            catValue = cat.getValue();
+                        }
+                        Double numberFreq = freq.get(catValue);
+                        if (numberFreq != null) {
+                            cat.setFrequency(numberFreq);
+                        } else {
+                            cat.setFrequency(0D);
+                        }
+                    }
+                } else {
+                    logger.fine("variableVector is null for variable " + vars.get(i).getName());
+                }
+            }
+        }
+    }
+
+    public static Hashtable calculateFrequency( Object[] variableVector) {
+        Hashtable freq = new Hashtable();
+
+        for (int j = 0; j < variableVector.length; j++) {
+            if (variableVector[j] != null) {
+                Double freqNum = freq.get(variableVector[j]);
+                if (freqNum != null) {
+                    freq.put(variableVector[j], freqNum + 1);
+                } else {
+                    freq.put(variableVector[j], 1D);
+                }
+            }
+        }
+
+        return freq;
+
+    }
     
     public void recalculateDataFileUNF(DataFile dataFile) {
         String[] unfValues = new String[dataFile.getDataTable().getVarQuantity().intValue()];
@@ -806,12 +871,14 @@ public boolean ingestAsTabular(Long datafile_id) {
                 } else {
                     tabDataIngest.getDataTable().setOriginalFileFormat(originalContentType);
                 }
+                tabDataIngest.getDataTable().setOriginalFileSize(originalFileSize);
 
                 dataFile.setDataTable(tabDataIngest.getDataTable());
                 tabDataIngest.getDataTable().setDataFile(dataFile);
 
                 try {
                     produceSummaryStatistics(dataFile, tabFile);
+                    produceFrequencyStatistics(dataFile, tabFile);
                     postIngestTasksSuccessful = true;
                 } catch (IOException postIngestEx) {
 
@@ -1609,6 +1676,22 @@ public void fixMissingOriginalTypes(List datafileIds) {
         logger.info("Finished repairing tabular data files that were missing the original file format labels.");
     }
     
+    // This method takes a list of file ids and tries to fix the size of the saved 
+    // original, if present
+    // Note the @Asynchronous attribute - this allows us to just kick off and run this 
+    // (potentially large) job in the background. 
+    // The method is called by the "fixmissingoriginalsizes" /admin api call. 
+    @Asynchronous
+    public void fixMissingOriginalSizes(List datafileIds) {
+        for (Long fileId : datafileIds) {
+            fixMissingOriginalSize(fileId);
+            try {
+                Thread.sleep(1000);
+            } catch (Exception ex) {}
+        }
+        logger.info("Finished repairing tabular data files that were missing the original file sizes.");
+    }
+    
     // This method fixes a datatable object that's missing the format type of 
     // the ingested original. It will check the saved original file to 
     // determine the type. 
@@ -1679,6 +1762,8 @@ private void fixMissingOriginalType(long fileId) {
                     logger.warning("Caught exception trying to determine original file type (datafile id=" + fileId + ", datatable id=" + datatableId + "): " + ioex.getMessage());
                 }
                 
+                Long savedOriginalFileSize = savedOriginalFile.length(); 
+                
                 // If we had to create a temp file, delete it now: 
                 if (tempFileRequired) {
                     savedOriginalFile.delete();
@@ -1703,6 +1788,7 @@ private void fixMissingOriginalType(long fileId) {
 
                 // save permanently in the database:
                 dataFile.getDataTable().setOriginalFileFormat(fileTypeDetermined);
+                dataFile.getDataTable().setOriginalFileSize(savedOriginalFileSize);
                 fileService.saveDataTable(dataFile.getDataTable());
 
             } else {
@@ -1713,6 +1799,46 @@ private void fixMissingOriginalType(long fileId) {
         }
     }
     
+    // This method fixes a datatable object that's missing the size of the 
+    // ingested original. 
+    private void fixMissingOriginalSize(long fileId) {
+        DataFile dataFile = fileService.find(fileId);
+
+        if (dataFile != null && dataFile.isTabularData()) {
+            Long savedOriginalFileSize = dataFile.getDataTable().getOriginalFileSize();
+            Long datatableId = dataFile.getDataTable().getId();
+            
+            if (savedOriginalFileSize == null) {
+                
+                StorageIO storageIO;
+                
+                try {
+                    storageIO = dataFile.getStorageIO();
+                    storageIO.open();
+                    savedOriginalFileSize = storageIO.getAuxObjectSize(FileUtil.SAVED_ORIGINAL_FILENAME_EXTENSION);
+
+                } catch (Exception ex) {
+                    logger.warning("Exception "+ex.getClass()+" caught trying to look up the size of the saved original; (datafile id=" + fileId + ", datatable id=" + datatableId + "): " + ex.getMessage());
+                    return;
+                }
+
+                if (savedOriginalFileSize == null) {
+                    logger.warning("Failed to look up the size of the saved original file! (datafile id=" + fileId + ", datatable id=" + datatableId + ")");
+                    return;
+                }
+
+                // save permanently in the database:
+                dataFile.getDataTable().setOriginalFileSize(savedOriginalFileSize);
+                fileService.saveDataTable(dataFile.getDataTable());
+
+            } else {
+                logger.info("DataFile id=" + fileId + "; original file size already present: " + savedOriginalFileSize);
+            }
+        } else {
+            logger.warning("DataFile id=" + fileId + ": No such DataFile!");
+        }
+    }
+    
     public static void main(String[] args) {
         
         String file = args[0];
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java
index 66420182584..d5ca06a96f3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/rdata/RTabFileParser.java
@@ -20,7 +20,10 @@
 package edu.harvard.iq.dataverse.ingest.tabulardata.impl.plugins.rdata;
 
 import java.io.*;
+import java.util.Arrays;
 import java.util.logging.*;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.apache.commons.lang.StringUtils;
 
 import edu.harvard.iq.dataverse.DataTable;
@@ -67,12 +70,12 @@ public int read(BufferedReader csvReader, DataTable dataTable, PrintWriter pwout
             varQnty = dataTable.getVarQuantity().intValue();
         } catch (Exception ex) {
             //return -1;
-            throw new IOException ("R Tab File Parser: Could not obtain varQnty from the dataset metadata.");
+            throw new IOException (BundleUtil.getStringFromBundle("rtabfileparser.ioexception.parser1"));
         }
 
         if (varQnty == 0) {
             //return -1;
-            throw new IOException ("R Tab File Parser: varQnty=0 in the dataset metadata!");
+            throw new IOException (BundleUtil.getStringFromBundle("rtabfileparser.ioexception.parser2"));
         }
 
         dbgLog.fine("CSV reader; varQnty: "+varQnty);
@@ -140,13 +143,12 @@ public int read(BufferedReader csvReader, DataTable dataTable, PrintWriter pwout
             valueTokens = line.split(""+delimiterChar, -2);
 
             if (valueTokens == null) {
-                throw new IOException("Failed to read line "+(lineCounter+1)+" of the Data file.");
+                throw new IOException(BundleUtil.getStringFromBundle("rtabfileparser.ioexception.failed" , Arrays.asList(Integer.toString(lineCounter + 1))));
 
             }
 
             if (valueTokens.length != varQnty) {
-                throw new IOException("Reading mismatch, line "+(lineCounter+1)+" of the Data file: " +
-                        varQnty + " delimited values expected, "+valueTokens.length+" found.");
+                throw new IOException(BundleUtil.getStringFromBundle("rtabfileparser.ioexception.mismatch" , Arrays.asList(Integer.toString(lineCounter + 1),Integer.toString(varQnty),Integer.toString(valueTokens.length))));
             }
 
             //dbgLog.fine("case: "+lineCounter);
@@ -238,10 +240,10 @@ public int read(BufferedReader csvReader, DataTable dataTable, PrintWriter pwout
                             // Legit case - Missing Value!
                             caseRow[i] = charToken;
                         } else {
-                            throw new IOException("Unexpected value for the Boolean variable ("+i+"): "+charToken);
+                            throw new IOException(BundleUtil.getStringFromBundle("rtabfileparser.ioexception.boolean" , Arrays.asList(Integer.toString( +i)))+charToken);
                         }
                     } else {
-                        throw new IOException("Couldn't read Boolean variable ("+i+")!");
+                        throw new IOException(BundleUtil.getStringFromBundle("rtabfileparser.ioexception.read" , Arrays.asList(Integer.toString(i))));
                     }
 
                     
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java
index d7fbbc870e5..ca213b2826f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ingest/tabulardata/impl/plugins/xlsx/XLSXFileReader.java
@@ -25,19 +25,14 @@
 import java.util.logging.*;
 import java.util.*;
 
-import javax.inject.Inject;
-
-
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
 import edu.harvard.iq.dataverse.ingest.tabulardata.spi.TabularDataFileReaderSpi;
 import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
@@ -51,8 +46,6 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
 
 
 /**
@@ -99,15 +92,15 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
         try {
             processSheet(stream, dataTable, firstPassWriter);
         } catch (Exception ex) {
-            throw new IOException("Could not parse Excel/XLSX spreadsheet. "+ex.getMessage());
+            throw new IOException(BundleUtil.getStringFromBundle("xlsxfilereader.ioexception.parse" , Arrays.asList(ex.getMessage())));
         }
 
         if (dataTable.getCaseQuantity() == null || dataTable.getCaseQuantity().intValue() < 1) {
             String errorMessage; 
             if (dataTable.getVarQuantity() == null || dataTable.getVarQuantity().intValue() < 1) {
-                errorMessage = "No rows of data found in the Excel (XLSX) file.";
+                errorMessage = BundleUtil.getStringFromBundle("xlsxfilereader.ioexception.norows");
             } else {
-                errorMessage = "Only one row of data (column name header?) detected in the Excel (XLSX) file.";
+                errorMessage = BundleUtil.getStringFromBundle("xlsxfilereader.ioexception.onlyonerow");
             }
             throw new IOException(errorMessage);
         }
@@ -132,12 +125,11 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
             valueTokens = line.split("" + delimiterChar, -2);
 
             if (valueTokens == null) {
-                throw new IOException("Failed to read line " + (lineCounter + 1) + " during the second pass.");
+                throw new IOException(BundleUtil.getStringFromBundle("xlsxfilereader.ioexception.failed" , Arrays.asList(Integer.toString(lineCounter + 1))));
             }
 
             if (valueTokens.length != varQnty) {
-                throw new IOException("Reading mismatch, line " + (lineCounter + 1) + " during the second pass: "
-                        + varQnty + " delimited values expected, " + valueTokens.length + " found.");
+                throw new IOException(BundleUtil.getStringFromBundle("xlsxfilereader.ioexception.mismatch" , Arrays.asList(Integer.toString(lineCounter + 1),Integer.toString(varQnty),Integer.toString(valueTokens.length))));
             }
         
             for (int i = 0; i < varQnty; i++) {
@@ -203,7 +195,7 @@ public TabularDataIngest read(BufferedInputStream stream, File dataFile) throws
         finalWriter.close();
         
         if (dataTable.getCaseQuantity().intValue() != lineCounter) {
-            throw new IOException("Mismatch between line counts in first and final passes!");
+            throw new IOException(BundleUtil.getStringFromBundle("xlsxfilereader.ioexception.linecount"));
         }
         
         dataTable.setUnf("UNF:6:NOTCALCULATED");
diff --git a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
index 35125091f84..10f9f7440f2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsServiceBean.java
@@ -4,6 +4,7 @@
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -28,6 +29,8 @@ public class MetricsServiceBean implements Serializable {
     @EJB
     SystemConfig systemConfig;
 
+    /** Dataverses */
+    
     /**
      * @param yyyymm Month in YYYY-MM format.
      */
@@ -43,7 +46,79 @@ public long dataversesToMonth(String yyyymm) throws Exception {
 
         return (long) query.getSingleResult();
     }
+    
+    public long dataversesPastDays(int days) throws Exception {
+        Query query = em.createNativeQuery(""
+                + "select count(dvobject.id)\n"
+                + "from dataverse\n"
+                + "join dvobject on dvobject.id = dataverse.id\n"
+                + "where dvobject.publicationdate is not null\n"
+                + "and publicationdate > current_date - interval '"+days+"' day;\n"
+        );
+
+        logger.fine("query: " + query);
+
+        return (long) query.getSingleResult();
+    }
+    
+    public List dataversesByCategory() throws Exception {
+
+        Query query = em.createNativeQuery(""
+                + "select dataversetype, count(dataversetype) from dataverse\n"
+                + "join dvobject on dvobject.id = dataverse.id\n"
+                + "where dvobject.publicationdate is not null\n"
+                + "group by dataversetype\n"
+                + "order by count desc;"
+        );
+
+        logger.fine("query: " + query);
+        return query.getResultList();
+    }
+    
+    public List dataversesBySubject() {
+        Query query = em.createNativeQuery(""
+                + "select cvv.strvalue, count(dataverse_id) from dataversesubjects\n"
+                + "join controlledvocabularyvalue cvv ON cvv.id = controlledvocabularyvalue_id\n"
+                + "group by cvv.strvalue\n"
+                + "order by count desc;"
+              
+        );
+        logger.info("query: " + query);
 
+        return query.getResultList();
+    }
+    
+    /** Datasets */
+
+    public List datasetsBySubject() {
+        Query query = em.createNativeQuery(""
+                + "SELECT strvalue, count(dataset.id)\n"
+                + "FROM datasetfield_controlledvocabularyvalue \n"
+                + "JOIN controlledvocabularyvalue ON controlledvocabularyvalue.id = datasetfield_controlledvocabularyvalue.controlledvocabularyvalues_id\n"
+                + "JOIN datasetfield ON datasetfield.id = datasetfield_controlledvocabularyvalue.datasetfield_id\n"
+                + "JOIN datasetfieldtype ON datasetfieldtype.id = controlledvocabularyvalue.datasetfieldtype_id\n"
+                + "JOIN datasetversion ON datasetversion.id = datasetfield.datasetversion_id\n"
+                + "JOIN dvobject ON dvobject.id = datasetversion.dataset_id\n"
+                + "JOIN dataset ON dataset.id = datasetversion.dataset_id\n"
+                + "WHERE\n"
+                + "datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in \n"
+                + "(\n"
+                + "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max \n"
+                + "from datasetversion\n"
+                + "join dataset on dataset.id = datasetversion.dataset_id\n"
+                + "where versionstate='RELEASED'\n"
+                + "and dataset.harvestingclient_id is null\n"
+                + "group by dataset_id \n"
+                + ")\n"
+                + "AND datasetfieldtype.name = 'subject'\n"
+                + "GROUP BY strvalue\n"
+                + "ORDER BY count(dataset.id) desc;"
+        );
+        logger.info("query: " + query);
+
+        return query.getResultList();
+    }
+    
     /**
      * @param yyyymm Month in YYYY-MM format.
      */
@@ -66,7 +141,31 @@ public long datasetsToMonth(String yyyymm) throws Exception {
 
         return (long) query.getSingleResult();
     }
+    
+    public long datasetsPastDays(int days) throws Exception {
+
+        Query query = em.createNativeQuery(
+            "select count(*)\n" +
+            "from datasetversion\n" +
+            "where datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in \n" +
+            "(\n" +
+            "	select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max \n" +
+            "	from datasetversion\n" +
+            "	join dataset on dataset.id = datasetversion.dataset_id\n" +
+            "	where versionstate='RELEASED' \n" +
+            "	and releasetime > current_date - interval '"+days+"' day\n" +
+            "	and dataset.harvestingclient_id is null\n" +
+            "	group by dataset_id \n" +
+            ");"
+        );
+        logger.fine("query: " + query);
+
+        return (long) query.getSingleResult();
+    }
 
+
+    /** Files */
+    
     /**
      * @param yyyymm Month in YYYY-MM format.
      */
@@ -81,7 +180,6 @@ public long filesToMonth(String yyyymm) throws Exception {
                 + "from datasetversion\n"
                 + "join dataset on dataset.id = datasetversion.dataset_id\n"
                 + "where versionstate='RELEASED'\n"
-                //                + "and date_trunc('month', releasetime) <=  to_date('2018-03','YYYY-MM')\n"
                 + "and date_trunc('month', releasetime) <=  to_date('" + yyyymm + "','YYYY-MM')\n"
                 + "and dataset.harvestingclient_id is null\n"
                 + "group by dataset_id \n"
@@ -90,7 +188,31 @@ public long filesToMonth(String yyyymm) throws Exception {
         logger.fine("query: " + query);
         return (long) query.getSingleResult();
     }
+    
+    public long filesPastDays(int days) throws Exception {
+        Query query = em.createNativeQuery(""
+                + "select count(*)\n"
+                + "from filemetadata\n"
+                + "join datasetversion on datasetversion.id = filemetadata.datasetversion_id\n"
+                + "where datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in \n"
+                + "(\n"
+                + "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max \n"
+                + "from datasetversion\n"
+                + "join dataset on dataset.id = datasetversion.dataset_id\n"
+                + "where versionstate='RELEASED'\n"
+                + "and releasetime > current_date - interval '"+days+"' day\n"
+                + "and dataset.harvestingclient_id is null\n"
+                + "group by dataset_id \n"
+                + ");"
+        );
+
+        logger.fine("query: " + query);
+
+        return (long) query.getSingleResult();
+    }
 
+    /** Downloads */
+    
     /**
      * @param yyyymm Month in YYYY-MM format.
      */
@@ -104,50 +226,29 @@ public long downloadsToMonth(String yyyymm) throws Exception {
         return (long) query.getSingleResult();
     }
 
-    public List dataversesByCategory() throws Exception {
-
+    public long downloadsPastDays(int days) throws Exception {
         Query query = em.createNativeQuery(""
-                + "select dataversetype, count(dataversetype) from dataverse\n"
-                + "join dvobject on dvobject.id = dataverse.id\n"
-                + "where dvobject.publicationdate is not null\n"
-                + "group by dataversetype\n"
-                + "order by count desc;"
+                + "select count(id)\n"
+                + "from guestbookresponse\n"
+                + "where responsetime > current_date - interval '"+days+"' day;\n"
         );
 
         logger.fine("query: " + query);
-        return query.getResultList();
-    }
 
-    public List datasetsBySubject() {
-        Query query = em.createNativeQuery(""
-               + "SELECT strvalue, count(dataset.id)\n"
-               + "FROM datasetfield_controlledvocabularyvalue \n"
-               + "JOIN controlledvocabularyvalue ON controlledvocabularyvalue.id = datasetfield_controlledvocabularyvalue.controlledvocabularyvalues_id\n"
-               + "JOIN datasetfield ON datasetfield.id = datasetfield_controlledvocabularyvalue.datasetfield_id\n"
-               + "JOIN datasetfieldtype ON datasetfieldtype.id = controlledvocabularyvalue.datasetfieldtype_id\n"
-               + "JOIN datasetversion ON datasetversion.id = datasetfield.datasetversion_id\n"
-               + "JOIN dvobject ON dvobject.id = datasetversion.dataset_id\n"
-               + "JOIN dataset ON dataset.id = datasetversion.dataset_id\n"
-               + "WHERE\n"
-               + "datasetversion.dataset_id || ':' || datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber) in \n"
-               + "(\n"
-               + "select datasetversion.dataset_id || ':' || max(datasetversion.versionnumber + (.1 * datasetversion.minorversionnumber)) as max \n"
-               + "from datasetversion\n"
-               + "join dataset on dataset.id = datasetversion.dataset_id\n"
-               + "where versionstate='RELEASED'\n"
-               + "and dataset.harvestingclient_id is null\n"
-               + "group by dataset_id \n"
-               + ")\n"
-               + "AND datasetfieldtype.name = 'subject'\n"
-               + "GROUP BY strvalue\n"
-               + "ORDER BY count(dataset.id) desc;"
-        );
-        logger.info("query: " + query);
-
-        return query.getResultList();
+        return (long) query.getSingleResult();
     }
+    
+    /** Helper functions for metric caching */
+    
+    public String returnUnexpiredCacheDayBased(String metricName, String days) throws Exception {
+        Metric queriedMetric = getMetric(metricName, days);
 
-    /* Helper functions for metric caching */
+        if (!doWeQueryAgainDayBased(queriedMetric)) {
+            return queriedMetric.getMetricValue();
+        }
+        return null;
+    }
+    
     public String returnUnexpiredCacheMonthly(String metricName, String yyyymm) throws Exception {
         Metric queriedMetric = getMetric(metricName, yyyymm);
 
@@ -165,6 +266,23 @@ public String returnUnexpiredCacheAllTime(String metricName) throws Exception {
         }
         return null;
     }
+        
+    //For day based metrics we check to see if the metric has been pulled today
+    public boolean doWeQueryAgainDayBased(Metric queriedMetric) {
+        if (null == queriedMetric) { //never queried before
+            return true;
+        }
+
+        LocalDate lastCalled = LocalDate.from(queriedMetric.getLastCalledDate().toInstant().atZone(ZoneId.systemDefault()));
+        LocalDate todayDate = LocalDate.now(ZoneId.systemDefault());
+        
+
+        if(!lastCalled.equals(todayDate)) {
+            return true;
+        } else {
+            return false;
+        }        
+    }
 
     //This is for deciding whether to used a cached value on monthly queries
     //Assumes the metric passed in is sane (e.g. not run for past the current month, not a garbled date string, etc)
@@ -228,8 +346,9 @@ public Metric save(Metric newMetric, boolean monthly) throws Exception {
         return em.merge(newMetric);
     }
 
-    public Metric getMetric(String metricTitle, String yymmmm) throws Exception {
-        String searchMetricName = Metric.generateMetricName(metricTitle, yymmmm);
+    //This works for date and day based metrics
+    public Metric getMetric(String metricTitle, String dayString) throws Exception {
+        String searchMetricName = Metric.generateMetricName(metricTitle, dayString);
 
         return getMetric(searchMetricName);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java
index cab496dbb99..96a9ef53974 100644
--- a/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/metrics/MetricsUtil.java
@@ -52,6 +52,19 @@ public static JsonArrayBuilder dataversesByCategoryToJson(List listOfO
         }
         return jab;
     }
+    
+    public static JsonArrayBuilder dataversesBySubjectToJson(List listOfObjectArrays){
+        JsonArrayBuilder jab = Json.createArrayBuilder();
+        for (Object[] objectArray : listOfObjectArrays) {
+            JsonObjectBuilder job = Json.createObjectBuilder();
+            String subject = (String) objectArray[0];
+            long count = (long) objectArray[1];
+            job.add(SUBJECT, subject);
+            job.add(COUNT, count);
+            jab.add(job);
+        }
+        return jab;
+    }
 
     public static JsonArrayBuilder datasetsBySubjectToJson(List listOfObjectArrays) {
         JsonArrayBuilder jab = Json.createArrayBuilder();
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java b/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java
index 7cd0df846c2..523d06bb8a1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/DataRetrieverAPI.java
@@ -37,6 +37,8 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -87,7 +89,7 @@ public class DataRetrieverAPI extends AbstractApiBean {
     public static final String JSON_ERROR_MSG_FIELD_NAME = "error_message";
     public static final String JSON_DATA_FIELD_NAME = "data";
     
-    public static final String MSG_NO_RESULTS_FOUND = "Sorry, no results were found.";
+    public static final String MSG_NO_RESULTS_FOUND = BundleUtil.getStringFromBundle("dataretrieverAPI.noMsgResultsFound");
     
     /**
      * Constructor
@@ -141,23 +143,7 @@ public String retrieveTestPager(@QueryParam("selectedPage") int selectedPage){
     
     
     public boolean isSuperuser(){
-        
-        // Is this an authenticated user?
-        //
-        if ((session.getUser() == null)||(!session.getUser().isAuthenticated())){ 
-             return false;             
-        }
-         
-        // Is this a user?
-        //
-        authUser =  (AuthenticatedUser)session.getUser();
-        if (authUser==null){
-            return false;
-        }
-        
-        // Is this a superuser?
-        //
-        return authUser.isSuperuser();
+        return (session.getUser() != null) && session.getUser().isSuperuser();
     }
     
     private AuthenticatedUser getUserFromIdentifier(String userIdentifier){
@@ -547,46 +533,4 @@ private JsonArrayBuilder formatSolrDocs(SolrQueryResponse solrResponse, RoleTagR
         return jsonSolrDocsArrayBuilder;
         
     }
-    
-
-    /*private JsonArrayBuilder formatSolrDocs(SolrQueryResponse solrResponse, MyDataFilterParams filterParams, MyDataFinder finder ){
-        
-        if (solrResponse == null){
-            logger.severe("DataRetrieverAPI.getDvObjectTypeCounts: formatSolrDocs should not be null");
-            return null;
-        }
-        JsonArrayBuilder jsonSolrDocsArrayBuilder = Json.createArrayBuilder();
-
-        for (SolrSearchResult doc : solrQueryResponse.getSolrSearchResults()){
-
-            if( authUser!= null){
-                doc.setUserRole(myDataQueryHelperServiceBean.getRolesOnDVO(authUser, doc.getEntityId(), filterParams.getRoleIds(), finder)); 
-            }
-            jsonSolrDocsArrayBuilder.add(doc.getJsonForMyData());
-        }
-        return jsonSolrDocsArrayBuilder;
-        
-    }
-    */
-    /*
-    @Path("test-it")
-    @Produces({"application/json"})
-    @GET
-    public String retrieveMyData(@QueryParam("key") String keyValue){ //String myDataParams) {
-        
-        final JsonObjectBuilder jsonData = Json.createObjectBuilder();
-        jsonData.add("name", keyValue);
-        return jsonData.build().toString();
-    }
-    */
-    
-    private void msg(String s){
-        //System.out.println(s);
-    }
-    
-    private void msgt(String s){
-        msg("-------------------------------");
-        msg(s);
-        msg("-------------------------------");
-    }
 }        
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
index 628249427c1..7cea611b06e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
+++ b/src/main/java/edu/harvard/iq/dataverse/mydata/MyDataFinder.java
@@ -86,7 +86,6 @@ public class MyDataFinder {
 
     
     public MyDataFinder(DataverseRolePermissionHelper rolePermissionHelper, RoleAssigneeServiceBean roleAssigneeService, DvObjectServiceBean dvObjectServiceBean, GroupServiceBean groupService) {
-        this.msgt("MyDataFinder, constructor");
         this.rolePermissionHelper = rolePermissionHelper;
         this.roleAssigneeService = roleAssigneeService;
         this.dvObjectServiceBean = dvObjectServiceBean;
@@ -158,26 +157,6 @@ public void initFields(){
     public DataverseRolePermissionHelper getRolePermissionHelper(){
         return this.rolePermissionHelper;
     }
-    /*
-    private ArrayList dataverseIds;
-    private ArrayList primaryDatasetIds;
-    private ArrayList primaryFileIds;
-    private ArrayList parentIds;
-    */
-    
-    /*public void runFindDataSteps(String userIdentifier){
-        this.userIdentifier = userIdentifier;
-        msgt("runFindDataSteps: " + userIdentifier);
-        if (!runStep1RoleAssignments()){
-            return;
-        }
-        if (!runStep2DirectAssignments()){
-            return;
-        }
-        if (!fileGrandparentFileIds.isEmpty()){
-            runStep3FilePermsAssignedAtDataverse();
-        }        
-    }*/
 
     public void runFindDataSteps(MyDataFilterParams filterParams){
         
@@ -298,14 +277,11 @@ public String getSolrDvObjectFilterQuery(){
         Set distinctParentIds = new HashSet<>(parentIds);
 
 
-        if ((distinctEntityIds.size() == 0) && (distinctParentIds.size() == 0)) {
+        if ((distinctEntityIds.isEmpty()) && (distinctParentIds.isEmpty())) {
             this.addErrorMessage(DataRetrieverAPI.MSG_NO_RESULTS_FOUND);
             return null;
         }
-
-        msg("distinctEntityIds (1): " + distinctEntityIds.size());
-        msg("distinctParentIds: " + distinctParentIds.size());
-
+        
         // See if we can trim down the list of distinctEntityIds
         //  If we have the parent of a distinctEntityId in distinctParentIds,
         //  then we query it via the parent
@@ -331,9 +307,7 @@ public String getSolrDvObjectFilterQuery(){
         }
         // Set the distinctEntityIds to the finalDirectEntityIds
         //distinctEntityIds = new HashSet<>(distinctEntityIds);
-        distinctEntityIds = new HashSet<>(finalDirectEntityIds);            
-        
-        msg("distinctEntityIds (2): " + distinctEntityIds.size());
+        distinctEntityIds = new HashSet<>(finalDirectEntityIds);
 
         // Start up a SolrQueryFormatter for building clauses
         //
@@ -508,7 +482,6 @@ private boolean runStep2DirectAssignments(){
         //msgt("runStep2DirectAssignments");
         
         List results = this.dvObjectServiceBean.getDvObjectInfoForMyData(directDvObjectIds);
-        msgt("runStep2DirectAssignments number of results: " + results.size());
 //List results = this.roleAssigneeService.getAssignmentsFor(this.userIdentifier);
         if (results.isEmpty()){
             this.addErrorMessage("Sorry, you have no assigned Dataverses, Datasets, or Files.");
@@ -582,13 +555,11 @@ private boolean runStep2DirectAssignments(){
     
     
     private boolean runStep3FilePermsAssignedAtDataverse(){
-        msgt("runStep3FilePermsAssignedAtDataverse");
         if ((this.fileGrandparentFileIds == null)||(this.fileGrandparentFileIds.isEmpty())){
             return true;
         }
         
         List results = this.dvObjectServiceBean.getDvObjectInfoByParentIdForMyData(this.fileGrandparentFileIds);
-        msg("runStep3FilePermsAssignedAtDataverse results count: " + results.size());
         /*  SEK 07/09 Ticket 2329
         Removed failure for empty results - if there are none let it go
         */
@@ -619,15 +590,6 @@ private boolean runStep3FilePermsAssignedAtDataverse(){
         
         return true;
     }
-    /*
-    private void postStep2Cleanup(){
-        // Clear step1 lookups
-        idsWithDataversePermissions = null;
-        idsWithDatasetPermissions = null;
-        idsWithFilePermissions = null;
-        directDvObjectIds = null;   // Direct ids no longer needed
-    }*/
-    
     
     public boolean hasError(){
         return this.errorFound;
@@ -639,15 +601,4 @@ private void addErrorMessage(String s){
         this.errorFound = true;
         this.errorMessage = s;
     }
-   
-    private void msg(String s){
-        //logger.fine(s);
-    }
-    
-    private void msgt(String s){
-        msg("-------------------------------");
-        msg(s);
-        msg("-------------------------------");
-    }
-
 }   // end: MyDataFinder
diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
index 82be0562ee6..000a50f9dd4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
@@ -124,7 +124,7 @@ public String sendPasswordResetLink() {
                  */
                 logger.log(Level.INFO, "Couldn''t find single account using {0}", emailAddress);
             }
-            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Password Reset Initiated", ""));
+            FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), ""));
         } catch (PasswordResetException ex) {
             /**
              * @todo do we really need a special exception for this??
diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java
index 3ae965cd6df..ff0055bebee 100644
--- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetServiceBean.java
@@ -2,12 +2,14 @@
 
 import edu.harvard.iq.dataverse.MailServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.PasswordEncryption;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUser;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 
+import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
@@ -93,20 +95,15 @@ public PasswordResetInitResponse requestPasswordReset( BuiltinUser aUser, boolea
 
     private void sendPasswordResetEmail(BuiltinUser aUser, String passwordResetUrl) throws PasswordResetException {
         AuthenticatedUser authUser = authService.getAuthenticatedUser(aUser.getUserName());
-        
-        String messageBody = "Hi " + authUser.getName() + ",\n\n"
-                + "Someone, hopefully you, requested a password reset for " + aUser.getUserName() + ".\n\n"
-                + "Please click the link below to reset your Dataverse account password:\n\n"
-                + passwordResetUrl + "\n\n"
-                + "The link above will only work for the next " + SystemConfig.getMinutesUntilPasswordResetTokenExpires() + " minutes.\n\n"
-                /**
-                 * @todo It would be a nice touch to show the IP from
-                 * which the password reset originated.
-                 */
-                + "Please contact us if you did not request this password reset or need further help.\n\n";
+
+        String pattern = BundleUtil.getStringFromBundle("notification.email.passwordReset");
+
+        String[] paramArray = {authUser.getName(), aUser.getUserName() ,passwordResetUrl,  SystemConfig.getMinutesUntilPasswordResetTokenExpires()+""  };
+        String messageBody = MessageFormat.format(pattern, paramArray);
+
         try {
             String toAddress = authUser.getEmail();
-            String subject = "Dataverse Password Reset Requested";
+            String subject = BundleUtil.getStringFromBundle("notification.email.passwordReset.subject");
             mailService.sendSystemEmail(toAddress, subject, messageBody);
         } catch (Exception ex) {
             /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/FakePidProviderServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/FakePidProviderServiceBean.java
new file mode 100644
index 00000000000..389e5b3d874
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/FakePidProviderServiceBean.java
@@ -0,0 +1,66 @@
+package edu.harvard.iq.dataverse.pidproviders;
+
+import edu.harvard.iq.dataverse.AbstractGlobalIdServiceBean;
+import edu.harvard.iq.dataverse.DvObject;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ejb.Stateless;
+
+@Stateless
+public class FakePidProviderServiceBean extends AbstractGlobalIdServiceBean {
+
+    @Override
+    public boolean alreadyExists(DvObject dvo) throws Exception {
+        return true;
+    }
+
+    @Override
+    public boolean registerWhenPublished() {
+        return false;
+    }
+
+    @Override
+    public List getProviderInformation() {
+        ArrayList providerInfo = new ArrayList<>();
+        String providerName = "FAKE";
+        String providerLink = "http://dataverse.org";
+        providerInfo.add(providerName);
+        providerInfo.add(providerLink);
+        return providerInfo;
+    }
+
+    @Override
+    public String createIdentifier(DvObject dvo) throws Throwable {
+        return "fakeIdentifier";
+    }
+
+    @Override
+    public Map getIdentifierMetadata(DvObject dvo) {
+        Map map = new HashMap<>();
+        return map;
+    }
+
+    @Override
+    public String modifyIdentifierTargetURL(DvObject dvo) throws Exception {
+        return "fakeModifyIdentifierTargetURL";
+    }
+
+    @Override
+    public void deleteIdentifier(DvObject dvo) throws Exception {
+        // no-op
+    }
+
+    @Override
+    public Map lookupMetadataFromIdentifier(String protocol, String authority, String identifier) {
+        Map map = new HashMap<>();
+        return map;
+    }
+
+    @Override
+    public boolean publicizeIdentifier(DvObject studyIn) {
+        return true;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java
index 468fdea9d14..a17e77f2a9e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java
+++ b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvInvestigator.java
@@ -131,14 +131,139 @@ public boolean isProvValid(String jsonInput) {
     //Pulled from https://www.w3.org/Submission/2013/SUBM-prov-json-20130424/schema
     //Not the prettiest way of accessing the schema, but loading the .json file as an external resource
     //turned out to be very painful, especially when also trying to exercise it via unit tests
+    //
+    //To solve https://github.com/IQSS/dataverse/issues/5154 , the provenance schema
+    //here was updated to include the "core schema" values being downloaded by the "id" tag. 
+    //If this schema needs to be updated (as of 2018, it hadn't been since 2013) this will need
+    //to be done manually again or we'll need to pull both files and store them on disk.
+    //The later option was not done previously because we couldn't get the same files to be
+    //referenced by the code and our junit tests.
     private static final String provSchema = 
         "{\n" +
-        "    \"id\": \"http://provenance.ecs.soton.ac.uk/prov-json/schema#\",\n" +
+        "    \"id\": \"\",\n" +
         "    \"$schema\": \"http://json-schema.org/draft-04/schema#\",\n" +
         "    \"description\": \"Schema for a PROV-JSON document\",\n" +
         "    \"type\": \"object\",\n" +
         "    \"additionalProperties\": false,\n" +
+        "    \"dependencies\": {\n" +
+        "        \"exclusiveMaximum\": [ \"maximum\" ],\n" +
+        "        \"exclusiveMinimum\": [ \"minimum\" ]\n" +
+        "    },"+
+        "    \"default\": {},\n" +
         "    \"properties\": {\n" +
+        "        \"id\": {\n" +
+        "            \"type\": \"string\"\n" +
+        "        },\n" +
+        "        \"$schema\": {\n" +
+        "            \"type\": \"string\"\n" +
+        "        },\n" +
+        "        \"title\": {\n" +
+        "            \"type\": \"string\"\n" +
+        "        },\n" +
+        "        \"description\": {\n" +
+        "            \"type\": \"string\"\n" +
+        "        },\n" +
+        "        \"default\": {},\n" +
+        "        \"multipleOf\": {\n" +
+        "            \"type\": \"number\",\n" +
+        "            \"minimum\": 0,\n" +
+        "            \"exclusiveMinimum\": true\n" +
+        "        },\n" +
+        "        \"maximum\": {\n" +
+        "            \"type\": \"number\"\n" +
+        "        },\n" +
+        "        \"exclusiveMaximum\": {\n" +
+        "            \"type\": \"boolean\",\n" +
+        "            \"default\": false\n" +
+        "        },\n" +
+        "        \"minimum\": {\n" +
+        "            \"type\": \"number\"\n" +
+        "        },\n" +
+        "        \"exclusiveMinimum\": {\n" +
+        "            \"type\": \"boolean\",\n" +
+        "            \"default\": false\n" +
+        "        },\n" +
+        "        \"maxLength\": { \"$ref\": \"#/definitions/positiveInteger\" },\n" +
+        "        \"minLength\": { \"$ref\": \"#/definitions/positiveIntegerDefault0\" },\n" +
+        "        \"pattern\": {\n" +
+        "            \"type\": \"string\",\n" +
+        "            \"format\": \"regex\"\n" +
+        "        },\n" +
+        "        \"additionalItems\": {\n" +
+        "            \"anyOf\": [\n" +
+        "                { \"type\": \"boolean\" },\n" +
+        "                { \"$ref\": \"#\" }\n" +
+        "            ],\n" +
+        "            \"default\": {}\n" +
+        "        },\n" +
+        "        \"items\": {\n" +
+        "            \"anyOf\": [\n" +
+        "                { \"$ref\": \"#\" },\n" +
+        "                { \"$ref\": \"#/definitions/schemaArray\" }\n" +
+        "            ],\n" +
+        "            \"default\": {}\n" +
+        "        },\n" +
+        "        \"maxItems\": { \"$ref\": \"#/definitions/positiveInteger\" },\n" +
+        "        \"minItems\": { \"$ref\": \"#/definitions/positiveIntegerDefault0\" },\n" +
+        "        \"uniqueItems\": {\n" +
+        "            \"type\": \"boolean\",\n" +
+        "            \"default\": false\n" +
+        "        },\n" +
+        "        \"maxProperties\": { \"$ref\": \"#/definitions/positiveInteger\" },\n" +
+        "        \"minProperties\": { \"$ref\": \"#/definitions/positiveIntegerDefault0\" },\n" +
+        "        \"required\": { \"$ref\": \"#/definitions/stringArray\" },\n" +
+        "        \"additionalProperties\": {\n" +
+        "            \"anyOf\": [\n" +
+        "                { \"type\": \"boolean\" },\n" +
+        "                { \"$ref\": \"#\" }\n" +
+        "            ],\n" +
+        "            \"default\": {}\n" +
+        "        },\n" +
+        "        \"definitions\": {\n" +
+        "            \"type\": \"object\",\n" +
+        "            \"additionalProperties\": { \"$ref\": \"#\" },\n" +
+        "            \"default\": {}\n" +
+        "        },\n" +
+        "        \"properties\": {\n" +
+        "            \"type\": \"object\",\n" +
+        "            \"additionalProperties\": { \"$ref\": \"#\" },\n" +
+        "            \"default\": {}\n" +
+        "        },\n" +
+        "        \"patternProperties\": {\n" +
+        "            \"type\": \"object\",\n" +
+        "            \"additionalProperties\": { \"$ref\": \"#\" },\n" +
+        "            \"default\": {}\n" +
+        "        },\n" +
+        "        \"dependencies\": {\n" +
+        "            \"type\": \"object\",\n" +
+        "            \"additionalProperties\": {\n" +
+        "                \"anyOf\": [\n" +
+        "                    { \"$ref\": \"#\" },\n" +
+        "                    { \"$ref\": \"#/definitions/stringArray\" }\n" +
+        "                ]\n" +
+        "            }\n" +
+        "        },\n" +
+        "        \"enum\": {\n" +
+        "            \"type\": \"array\",\n" +
+        "            \"minItems\": 1,\n" +
+        "            \"uniqueItems\": true\n" +
+        "        },\n" +
+        "        \"type\": {\n" +
+        "            \"anyOf\": [\n" +
+        "                { \"$ref\": \"#/definitions/simpleTypes\" },\n" +
+        "                {\n" +
+        "                    \"type\": \"array\",\n" +
+        "                    \"items\": { \"$ref\": \"#/definitions/simpleTypes\" },\n" +
+        "                    \"minItems\": 1,\n" +
+        "                    \"uniqueItems\": true\n" +
+        "                }\n" +
+        "            ]\n" +
+        "        },\n" +
+        "        \"format\": { \"type\": \"string\" },\n" +
+        "        \"allOf\": { \"$ref\": \"#/definitions/schemaArray\" },\n" +
+        "        \"anyOf\": { \"$ref\": \"#/definitions/schemaArray\" },\n" +
+        "        \"oneOf\": { \"$ref\": \"#/definitions/schemaArray\" },\n" +
+        "        \"not\": { \"$ref\": \"#\" },\n" +
         "        \"prefix\": {\n" +
         "            \"type\": \"object\",\n" +
         "            \"patternProperties\": {\n" +
@@ -219,6 +344,27 @@ public boolean isProvValid(String jsonInput) {
         "        }\n" +
         "    },\n" +
         "    \"definitions\": {\n" +
+        "        \"schemaArray\": {\n" +
+        "            \"type\": \"array\",\n" +
+        "            \"minItems\": 1,\n" +
+        "            \"items\": { \"$ref\": \"#\" }\n" +
+        "        },\n" +
+        "        \"positiveInteger\": {\n" +
+        "            \"type\": \"integer\",\n" +
+        "            \"minimum\": 0\n" +
+        "        },\n" +
+        "        \"positiveIntegerDefault0\": {\n" +
+        "            \"allOf\": [ { \"$ref\": \"#/definitions/positiveInteger\" }, { \"default\": 0 } ]\n" +
+        "        },\n" +
+        "        \"simpleTypes\": {\n" +
+        "            \"enum\": [ \"array\", \"boolean\", \"integer\", \"null\", \"number\", \"object\", \"string\" ]\n" +
+        "        },\n" +
+        "        \"stringArray\": {\n" +
+        "            \"type\": \"array\",\n" +
+        "            \"items\": { \"type\": \"string\" },\n" +
+        "            \"minItems\": 1,\n" +
+        "            \"uniqueItems\": true\n" +
+        "        },\n"+
         "        \"typedLiteral\": {\n" +
         "            \"title\": \"PROV-JSON Typed Literal\",\n" +
         "            \"type\": \"object\",\n" +
diff --git a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java
index 11003389f1d..cea26bc65db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java
@@ -97,9 +97,9 @@ public void handleFileUpload(FileUploadEvent event) throws IOException {
         
         if(!provUtil.isProvValid(provJsonState)) { //if uploaded prov-json does not comply with schema
             Logger.getLogger(ProvPopupFragmentBean.class.getName())
-                    .log(Level.SEVERE, BundleUtil.getStringFromBundle("file.editProvenanceDialog.invalidSchemaError")); 
+                    .log(Level.INFO, BundleUtil.getStringFromBundle("file.editProvenanceDialog.invalidSchemaError")); 
             removeJsonAndRelatedData();
-            JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.editProvenanceDialog.invalidSchemaError")); 
+            JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.editProvenanceDialog.invalidSchemaError"));
         }
         
         else {
@@ -110,11 +110,11 @@ public void handleFileUpload(FileUploadEvent event) throws IOException {
                 Logger.getLogger(ProvPopupFragmentBean.class.getName())
                         .log(Level.SEVERE, BundleUtil.getStringFromBundle("file.editProvenanceDialog.uploadError"), e);
                 removeJsonAndRelatedData();
-                JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.editProvenanceDialog.uploadError")); 
+                JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.editProvenanceDialog.uploadError"));
             } 
             if(provJsonParsedEntities.isEmpty()) {
                 removeJsonAndRelatedData();
-                JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.editProvenanceDialog.noEntitiesError"));
+                JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.editProvenanceDialog.noEntitiesError"));
             }
         }
 
@@ -255,24 +255,24 @@ public void addSuccessMessageToPage(boolean saveInPopup) {
         if(saveInPopup) {
             if(isJsonUpdated()) {
                 if(isDataFilePublishedRendering()) {
-                   message += JH.localize("file.provAlert.filePage.published.json");
+                   message += BundleUtil.getStringFromBundle("file.provAlert.filePage.published.json");
                 } else {
-                   message += JH.localize("file.provAlert.filePage.unpublished.json");
+                   message += BundleUtil.getStringFromBundle("file.provAlert.filePage.unpublished.json");
                 }
             }
             if (isFreeformUpdated()) {
-                message += JH.localize("file.provAlert.filePage.freeform");
+                message += BundleUtil.getStringFromBundle("file.provAlert.filePage.freeform");
             }
         } else {
             if(isJsonUpdated()) {
                 if(isDataFilePublishedRendering()) {
-                   message += JH.localize("file.provAlert.published.json");
+                   message += BundleUtil.getStringFromBundle("file.provAlert.published.json");
                 } else {
-                   message += JH.localize("file.provAlert.unpublished.json");
+                   message += BundleUtil.getStringFromBundle("file.provAlert.unpublished.json");
                 }
             }
             if (isFreeformUpdated()) {
-                message += JH.localize("file.provAlert.freeform");
+                message += BundleUtil.getStringFromBundle("file.provAlert.freeform");
             }
         } 
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
index 108ed5b1a5a..35259513fe4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -44,6 +44,7 @@ public class AdvancedSearchPage implements java.io.Serializable {
     private Map> metadataFieldMap = new HashMap<>();
     private List metadataFieldList;
     private String dvFieldName;
+    private String dvFieldAlias;
     private String dvFieldDescription;
     private String dvFieldAffiliation;
     private List dvFieldSubject;
@@ -123,6 +124,9 @@ private String constructDataverseQuery() {
         if (StringUtils.isNotBlank(dvFieldName)) {
             queryStrings.add(constructQuery(SearchFields.DATAVERSE_NAME, dvFieldName));
         }
+        if (StringUtils.isNotBlank(dvFieldAlias)) {
+            queryStrings.add(constructQuery(SearchFields.DATAVERSE_ALIAS, dvFieldAlias));
+        }
 
         if (StringUtils.isNotBlank(dvFieldAffiliation)) {
             queryStrings.add(constructQuery(SearchFields.DATAVERSE_AFFILIATION, dvFieldAffiliation));
@@ -278,6 +282,14 @@ public void setDvFieldName(String dvFieldName) {
         this.dvFieldName = dvFieldName;
     }
 
+    public String getDvFieldAlias() {
+        return dvFieldAlias;
+    }
+
+    public void setDvFieldAlias(String dvFieldAlias) {
+        this.dvFieldAlias = dvFieldAlias;
+    }
+
     public String getDvFieldDescription() {
         return dvFieldDescription;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
index 5994a433581..058b5c5da12 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -19,12 +19,17 @@
 import edu.harvard.iq.dataverse.PermissionServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
+import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataaccess.DataAccessRequest;
+import edu.harvard.iq.dataverse.dataaccess.StorageIO;
 import edu.harvard.iq.dataverse.datavariable.DataVariable;
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.IOException;
+import java.io.InputStream;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -62,6 +67,12 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrInputDocument;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.io.IOUtils;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.sax.BodyContentHandler;
+import org.xml.sax.ContentHandler;
 
 @Stateless
 @Named
@@ -71,7 +82,7 @@ public class IndexServiceBean {
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
     private EntityManager em;
-    
+
     @EJB
     DvObjectServiceBean dvObjectService;
     @EJB
@@ -94,6 +105,8 @@ public class IndexServiceBean {
     DatasetLinkingServiceBean dsLinkingService;
     @EJB
     DataverseLinkingServiceBean dvLinkingService;
+    @EJB
+    SettingsServiceBean settingsService;
 
     public static final String solrDocIdentifierDataverse = "dataverse_";
     public static final String solrDocIdentifierFile = "datafile_";
@@ -112,19 +125,19 @@ public class IndexServiceBean {
     private static final String DEACCESSIONED_STRING = "Deaccessioned";
     public static final String HARVESTED = "Harvested";
     private String rootDataverseName;
-    private Dataverse rootDataverseCached; 
+    private Dataverse rootDataverseCached;
     private SolrClient solrServer;
-    
+
     @PostConstruct
-    public void init(){
+    public void init() {
         String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
         solrServer = new HttpSolrClient.Builder(urlString).build();
 
         rootDataverseName = findRootDataverseCached().getName();
     }
-    
+
     @PreDestroy
-    public void close(){
+    public void close() {
         if (solrServer != null) {
             try {
                 solrServer.close();
@@ -139,7 +152,7 @@ public void close(){
     public Future indexDataverseInNewTransaction(Dataverse dataverse) {
         return indexDataverse(dataverse);
     }
-    
+
     public Future indexDataverse(Dataverse dataverse) {
         logger.fine("indexDataverse called on dataverse id " + dataverse.getId() + "(" + dataverse.getAlias() + ")");
         if (dataverse.getId() == null) {
@@ -165,6 +178,7 @@ public Future indexDataverse(Dataverse dataverse) {
         solrInputDocument.addField(SearchFields.NAME, dataverse.getName());
         solrInputDocument.addField(SearchFields.NAME_SORT, dataverse.getName());
         solrInputDocument.addField(SearchFields.DATAVERSE_NAME, dataverse.getName());
+        solrInputDocument.addField(SearchFields.DATAVERSE_ALIAS, dataverse.getAlias());
         solrInputDocument.addField(SearchFields.DATAVERSE_CATEGORY, dataverse.getIndexableCategoryName());
         if (dataverse.isReleased()) {
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, PUBLISHED_STRING);
@@ -181,22 +195,24 @@ public Future indexDataverse(Dataverse dataverse) {
             solrInputDocument.addField(SearchFields.IS_HARVESTED, true);
             solrInputDocument.addField(SearchFields.SOURCE, HARVESTED);
         } else { (this means that all dataverses are "local" - should this be removed? */
-            solrInputDocument.addField(SearchFields.IS_HARVESTED, false);
-            solrInputDocument.addField(SearchFields.METADATA_SOURCE, findRootDataverseCached().getName()); //rootDataverseName);
+        solrInputDocument.addField(SearchFields.IS_HARVESTED, false);
+        solrInputDocument.addField(SearchFields.METADATA_SOURCE, findRootDataverseCached().getName()); //rootDataverseName);
         /*}*/
 
         addDataverseReleaseDateToSolrDoc(solrInputDocument, dataverse);
-//        if (dataverse.getOwner() != null) {
-//            solrInputDocument.addField(SearchFields.HOST_DATAVERSE, dataverse.getOwner().getName());
-//        }
+        // if (dataverse.getOwner() != null) {
+        // solrInputDocument.addField(SearchFields.HOST_DATAVERSE,
+        // dataverse.getOwner().getName());
+        // }
         solrInputDocument.addField(SearchFields.DESCRIPTION, StringUtil.html2text(dataverse.getDescription()));
         solrInputDocument.addField(SearchFields.DATAVERSE_DESCRIPTION, StringUtil.html2text(dataverse.getDescription()));
-//        logger.info("dataverse affiliation: " + dataverse.getAffiliation());
+        // logger.info("dataverse affiliation: " + dataverse.getAffiliation());
         if (dataverse.getAffiliation() != null && !dataverse.getAffiliation().isEmpty()) {
             /**
              * @todo: stop using affiliation as category
              */
-//            solrInputDocument.addField(SearchFields.CATEGORY, dataverse.getAffiliation());
+            // solrInputDocument.addField(SearchFields.CATEGORY,
+            // dataverse.getAffiliation());
             solrInputDocument.addField(SearchFields.AFFILIATION, dataverse.getAffiliation());
             solrInputDocument.addField(SearchFields.DATAVERSE_AFFILIATION, dataverse.getAffiliation());
         }
@@ -220,11 +236,12 @@ public Future indexDataverse(Dataverse dataverse) {
         List dataverseSegments = findPathSegments(dataverse, dataversePathSegmentsAccumulator);
         List dataversePaths = getDataversePathsFromSegments(dataverseSegments);
         if (dataversePaths.size() > 0) {
-            // don't show yourself while indexing or in search results: https://redmine.hmdc.harvard.edu/issues/3613
-//            logger.info(dataverse.getName() + " size " + dataversePaths.size());
+            // don't show yourself while indexing or in search results:
+            // https://redmine.hmdc.harvard.edu/issues/3613
+            // logger.info(dataverse.getName() + " size " + dataversePaths.size());
             dataversePaths.remove(dataversePaths.size() - 1);
         }
-        //Add paths for linking dataverses
+        // Add paths for linking dataverses
         for (Dataverse linkingDataverse : dvLinkingService.findLinkingDataverses(dataverse.getId())) {
             List linkingDataversePathSegmentsAccumulator = new ArrayList<>();
             List linkingdataverseSegments = findPathSegments(linkingDataverse, linkingDataversePathSegmentsAccumulator);
@@ -267,27 +284,36 @@ public Future indexDataverse(Dataverse dataverse) {
     public Future indexDatasetInNewTransaction(Long datasetId) { //Dataset dataset) {
         boolean doNormalSolrDocCleanUp = false;
         Dataset dataset = em.find(Dataset.class, datasetId);
-        //return indexDataset(dataset, doNormalSolrDocCleanUp);
+        // return indexDataset(dataset, doNormalSolrDocCleanUp);
         Future ret = indexDataset(dataset, doNormalSolrDocCleanUp);
-        dataset = null; 
+        dataset = null;
         return ret;
     }
-    
+
     @Asynchronous
     public Future asyncIndexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
         return indexDataset(dataset, doNormalSolrDocCleanUp);
     }
     
+    @Asynchronous
+    public void asyncIndexDatasetList(List datasets, boolean doNormalSolrDocCleanUp) {
+        for(Dataset dataset : datasets) {
+            indexDataset(dataset, true);
+        }
+    }
+    
     public Future indexDataset(Dataset dataset, boolean doNormalSolrDocCleanUp) {
         logger.fine("indexing dataset " + dataset.getId());
         /**
          * @todo should we use solrDocIdentifierDataset or
          * IndexableObject.IndexableTypes.DATASET.getName() + "_" ?
          */
-//        String solrIdPublished = solrDocIdentifierDataset + dataset.getId();
+        // String solrIdPublished = solrDocIdentifierDataset + dataset.getId();
         String solrIdPublished = determinePublishedDatasetSolrDocId(dataset);
         String solrIdDraftDataset = IndexableObject.IndexableTypes.DATASET.getName() + "_" + dataset.getId() + IndexableDataset.DatasetState.WORKING_COPY.getSuffix();
-//        String solrIdDeaccessioned = IndexableObject.IndexableTypes.DATASET.getName() + "_" + dataset.getId() + IndexableDataset.DatasetState.DEACCESSIONED.getSuffix();
+        // String solrIdDeaccessioned = IndexableObject.IndexableTypes.DATASET.getName()
+        // + "_" + dataset.getId() +
+        // IndexableDataset.DatasetState.DEACCESSIONED.getSuffix();
         String solrIdDeaccessioned = determineDeaccessionedDatasetId(dataset);
         StringBuilder debug = new StringBuilder();
         debug.append("\ndebug:\n");
@@ -402,8 +428,8 @@ public Future indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 desiredCards.put(DatasetVersion.VersionState.RELEASED, false);
                 if (doNormalSolrDocCleanUp) {
                     String deletePublishedResults = removePublished(dataset);
-                    results.append("No published version. Attempting to delete traces of published version from index. Result: ").
-                            append(deletePublishedResults).append("\n");
+                    results.append("No published version. Attempting to delete traces of published version from index. Result: ")
+                            .append(deletePublishedResults).append("\n");
                 }
 
                 /**
@@ -446,8 +472,7 @@ public Future indexDataset(Dataset dataset, boolean doNormalSolrDocClean
                 desiredCards.put(DatasetVersion.VersionState.RELEASED, false);
                 if (doNormalSolrDocCleanUp) {
                     String deletePublishedResults = removePublished(dataset);
-                    results.append("No published version. Attempting to delete traces of published version from index. Result: ").
-                            append(deletePublishedResults).append("\n");
+                    results.append("No published version. Attempting to delete traces of published version from index. Result: ").append(deletePublishedResults).append("\n");
                 }
 
                 desiredCards.put(DatasetVersion.VersionState.DRAFT, false);
@@ -635,7 +660,7 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
             logger.info("failed to find dataverseSegments for dataversePaths for " + SearchFields.SUBTREE + ": " + ex);
         }
         List dataversePaths = getDataversePathsFromSegments(dataverseSegments);
-        //Add Paths for linking dataverses
+        // Add Paths for linking dataverses
         for (Dataverse linkingDataverse : dsLinkingService.findLinkingDataverses(dataset.getId())) {
             List linkingDataversePathSegmentsAccumulator = new ArrayList<>();
             List linkingdataverseSegments = findPathSegments(linkingDataverse, linkingDataversePathSegmentsAccumulator);
@@ -650,11 +675,16 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
         solrInputDocument.addField(SearchFields.ENTITY_ID, dataset.getId());
         String dataverseVersion = systemConfig.getVersion();
         solrInputDocument.addField(SearchFields.DATAVERSE_VERSION_INDEXED_BY, dataverseVersion);
-        solrInputDocument.addField(SearchFields.IDENTIFIER, dataset.getGlobalIdString());
-        solrInputDocument.addField(SearchFields.DATASET_PERSISTENT_ID, dataset.getGlobalIdString());
+        solrInputDocument.addField(SearchFields.IDENTIFIER, dataset.getGlobalId().toString());
+        solrInputDocument.addField(SearchFields.DATASET_PERSISTENT_ID, dataset.getGlobalId().toString());
         solrInputDocument.addField(SearchFields.PERSISTENT_URL, dataset.getPersistentURL());
         solrInputDocument.addField(SearchFields.TYPE, "datasets");
 
+        //This only grabs the immediate parent dataverse's category. We do the same for dataverses themselves.
+        solrInputDocument.addField(SearchFields.CATEGORY_OF_DATAVERSE, dataset.getDataverseContext().getIndexableCategoryName());
+        solrInputDocument.addField(SearchFields.IDENTIFIER_OF_DATAVERSE, dataset.getDataverseContext().getAlias());
+        solrInputDocument.addField(SearchFields.DATAVERSE_NAME, dataset.getDataverseContext().getDisplayName());
+        
         Date datasetSortByDate = new Date();
         Date majorVersionReleaseDate = dataset.getMostRecentMajorVersionReleaseDate();
         if (majorVersionReleaseDate != null) {
@@ -687,7 +717,8 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
 
         if (state.equals(indexableDataset.getDatasetState().PUBLISHED)) {
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, PUBLISHED_STRING);
-//            solrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE, dataset.getPublicationDate());
+            // solrInputDocument.addField(SearchFields.RELEASE_OR_CREATE_DATE,
+            // dataset.getPublicationDate());
         } else if (state.equals(indexableDataset.getDatasetState().WORKING_COPY)) {
             solrInputDocument.addField(SearchFields.PUBLICATION_STATUS, DRAFT_STRING);
         }
@@ -722,9 +753,11 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
 
                 if (dsf.getValues() != null && !dsf.getValues().isEmpty() && dsf.getValues().get(0) != null && solrFieldSearchable != null) {
                     logger.fine("indexing " + dsf.getDatasetFieldType().getName() + ":" + dsf.getValues() + " into " + solrFieldSearchable + " and maybe " + solrFieldFacetable);
-//                    if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.INTEGER)) {
+                    // if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.INTEGER))
+                    // {
                     if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.EMAIL)) {
-                        //no-op. we want to keep email address out of Solr per https://github.com/IQSS/dataverse/issues/759
+                        // no-op. we want to keep email address out of Solr per
+                        // https://github.com/IQSS/dataverse/issues/759
                     } else if (dsfType.getSolrField().getSolrType().equals(SolrField.SolrType.DATE)) {
                         String dateAsString = dsf.getValues_nondisplay().get(0);
                         logger.fine("date as string: " + dateAsString);
@@ -740,10 +773,12 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                                 SimpleDateFormat yearOnly = new SimpleDateFormat("yyyy");
                                 String datasetFieldFlaggedAsDate = yearOnly.format(dateAsDate);
                                 logger.fine("YYYY only: " + datasetFieldFlaggedAsDate);
-//                                solrInputDocument.addField(solrFieldSearchable, Integer.parseInt(datasetFieldFlaggedAsDate));
+                                // solrInputDocument.addField(solrFieldSearchable,
+                                // Integer.parseInt(datasetFieldFlaggedAsDate));
                                 solrInputDocument.addField(solrFieldSearchable, datasetFieldFlaggedAsDate);
                                 if (dsfType.getSolrField().isFacetable()) {
-//                                    solrInputDocument.addField(solrFieldFacetable, Integer.parseInt(datasetFieldFlaggedAsDate));
+                                    // solrInputDocument.addField(solrFieldFacetable,
+                                    // Integer.parseInt(datasetFieldFlaggedAsDate));
                                     solrInputDocument.addField(solrFieldFacetable, datasetFieldFlaggedAsDate);
                                 }
                             } catch (Exception ex) {
@@ -766,7 +801,8 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                              */
                             solrInputDocument.addField(SearchFields.AFFILIATION, dsf.getValuesWithoutNaValues());
                         } else if (dsf.getDatasetFieldType().getName().equals("title")) {
-                            // datasets have titles not names but index title under name as well so we can sort datasets by name along dataverses and files
+                            // datasets have titles not names but index title under name as well so we can
+                            // sort datasets by name along dataverses and files
                             List possibleTitles = dsf.getValues();
                             String firstTitle = possibleTitles.get(0);
                             if (firstTitle != null) {
@@ -812,7 +848,8 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
         }
 
         solrInputDocument.addField(SearchFields.SUBTREE, dataversePaths);
-//        solrInputDocument.addField(SearchFields.HOST_DATAVERSE, dataset.getOwner().getName());
+        // solrInputDocument.addField(SearchFields.HOST_DATAVERSE,
+        // dataset.getOwner().getName());
         solrInputDocument.addField(SearchFields.PARENT_ID, dataset.getOwner().getId());
         solrInputDocument.addField(SearchFields.PARENT_NAME, dataset.getOwner().getName());
 
@@ -825,13 +862,21 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
 
         docs.add(solrInputDocument);
 
+        /**
+         * File Indexing
+         */
+        boolean doFullTextIndexing = settingsService.isTrueForKey(SettingsServiceBean.Key.SolrFullTextIndexing, false);
+        Long maxFTIndexingSize = settingsService.getValueForKeyAsLong(SettingsServiceBean.Key.SolrMaxFileSizeForFullTextIndexing);
+        long maxSize = maxFTIndexingSize != null ? maxFTIndexingSize.longValue() : Long.MAX_VALUE;
+
         List filesIndexed = new ArrayList<>();
         if (datasetVersion != null) {
             List fileMetadatas = datasetVersion.getFileMetadatas();
             boolean checkForDuplicateMetadata = false;
             if (datasetVersion.isDraft() && dataset.isReleased() && dataset.getReleasedVersion() != null) {
                 checkForDuplicateMetadata = true;
-                logger.fine("We are indexing a draft version of a dataset that has a released version. We'll be checking file metadatas if they are exact clones of the released versions.");
+                logger.fine(
+                        "We are indexing a draft version of a dataset that has a released version. We'll be checking file metadatas if they are exact clones of the released versions.");
             }
 
             for (FileMetadata fileMetadata : fileMetadatas) {
@@ -840,11 +885,23 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                     logger.fine("Checking if this file metadata is a duplicate.");
                     for (FileMetadata releasedFileMetadata : dataset.getReleasedVersion().getFileMetadatas()) {
                         if (fileMetadata.getDataFile() != null && fileMetadata.getDataFile().equals(releasedFileMetadata.getDataFile())) {
-                            if (fileMetadata.contentEquals(releasedFileMetadata)) {
-                                indexThisMetadata = false;
-                                logger.fine("This file metadata hasn't changed since the released version; skipping indexing.");
+                            /*
+                             * Duplicate if metadata matches and, for full text indexing and the
+                             * SearchFields.ACCESS field, if the restricted status of the file hasn't
+                             * changed. To address the case where full text indexing was on when a file was
+                             * not restricted and it is now restricted and full text indexing has been shut
+                             * off, we need to check for the change in restricted status regardless of
+                             * whether full text indexing is on now.
+                             */
+                            if ((fileMetadata.getDataFile().isRestricted() == releasedFileMetadata.getDataFile().isRestricted())) {
+                                if (fileMetadata.contentEquals(releasedFileMetadata)) {
+                                    indexThisMetadata = false;
+                                    logger.fine("This file metadata hasn't changed since the released version; skipping indexing.");
+                                } else {
+                                    logger.fine("This file metadata has changed since the released version; we want to index it!");
+                                }
                             } else {
-                                logger.fine("This file metadata has changed since the released version; we want to index it!");
+                                logger.fine("This file's restricted status has changed since the released version; we want to index it!");
                             }
                             break;
                         }
@@ -858,6 +915,56 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                     datafileSolrInputDocument.addField(SearchFields.IDENTIFIER, fileEntityId);
                     datafileSolrInputDocument.addField(SearchFields.PERSISTENT_URL, dataset.getPersistentURL());
                     datafileSolrInputDocument.addField(SearchFields.TYPE, "files");
+                    datafileSolrInputDocument.addField(SearchFields.CATEGORY_OF_DATAVERSE, dataset.getDataverseContext().getIndexableCategoryName());
+
+                    /* Full-text indexing using Apache Tika */
+                    if (doFullTextIndexing) {
+                        if (!dataset.isHarvested() && !fileMetadata.getDataFile().isRestricted() && !fileMetadata.getDataFile().isFilePackage()) {
+                            StorageIO accessObject = null;
+                            InputStream instream = null;
+                            ContentHandler textHandler = null;
+                            try {
+                                accessObject = DataAccess.getStorageIO(fileMetadata.getDataFile(),
+                                        new DataAccessRequest());
+                                if (accessObject != null) {
+                                    accessObject.open();
+                                    // If the size is >max, we don't use the stream. However, for S3, the stream is
+                                    // currently opened in the call above (see
+                                    // https://github.com/IQSS/dataverse/issues/5165), so we want to get a handle so
+                                    // we can close it below.
+                                    instream = accessObject.getInputStream();
+                                    if (accessObject.getSize() <= maxSize) {
+                                        AutoDetectParser autoParser = new AutoDetectParser();
+                                        textHandler = new BodyContentHandler(-1);
+                                        Metadata metadata = new Metadata();
+                                        ParseContext context = new ParseContext();
+                                        /*
+                                         * Try parsing the file. Note that, other than by limiting size, there's been no
+                                         * check see whether this file is a good candidate for text extraction (e.g.
+                                         * based on type).
+                                         */
+                                        autoParser.parse(instream, textHandler, metadata, context);
+                                        datafileSolrInputDocument.addField(SearchFields.FULL_TEXT,
+                                                textHandler.toString());
+                                    }
+                                }
+                            } catch (Exception e) {
+                                // Needs better logging of what went wrong in order to
+                                // track down "bad" documents.
+                                logger.warning(String.format("Full-text indexing for %s failed",
+                                        fileMetadata.getDataFile().getDisplayName()));
+                                e.printStackTrace();
+                                continue;
+                            } catch (OutOfMemoryError e) {
+                                textHandler = null;
+                                logger.warning(String.format("Full-text indexing for %s failed due to OutOfMemoryError",
+                                        fileMetadata.getDataFile().getDisplayName()));
+                                continue;
+                            } finally {
+                                IOUtils.closeQuietly(instream);
+                            }
+                        }
+                    }
 
                     String filenameCompleteFinal = "";
                     if (fileMetadata != null) {
@@ -920,7 +1027,8 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                                 String msg = "fileCreateTimestamp was null for fileMetadata id " + fileMetadata.getId() + " (file id " + datafile.getId() + ")";
                                 logger.info(msg);
                             }
-                            datafileSolrInputDocument.addField(SearchFields.ACCESS, fileMetadata.isRestricted() ? SearchConstants.RESTRICTED : SearchConstants.PUBLIC);
+                            datafileSolrInputDocument.addField(SearchFields.ACCESS,
+                                    fileMetadata.isRestricted() ? SearchConstants.RESTRICTED : SearchConstants.PUBLIC);
                         }
                         if (datafile.isHarvested()) {
                             datafileSolrInputDocument.addField(SearchFields.IS_HARVESTED, true);
@@ -954,7 +1062,7 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                     if (indexableDataset.getDatasetState().equals(indexableDataset.getDatasetState().PUBLISHED)) {
                         fileSolrDocId = solrDocIdentifierFile + fileEntityId;
                         datafileSolrInputDocument.addField(SearchFields.PUBLICATION_STATUS, PUBLISHED_STRING);
-//                    datafileSolrInputDocument.addField(SearchFields.PERMS, publicGroupString);
+                        // datafileSolrInputDocument.addField(SearchFields.PERMS, publicGroupString);
                         addDatasetReleaseDateToSolrDoc(datafileSolrInputDocument, dataset);
                     } else if (indexableDataset.getDatasetState().equals(indexableDataset.getDatasetState().WORKING_COPY)) {
                         fileSolrDocId = solrDocIdentifierFile + fileEntityId + indexableDataset.getDatasetState().getSuffix();
@@ -965,7 +1073,7 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                     datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_FRIENDLY, fileMetadata.getDataFile().getFriendlyType());
                     datafileSolrInputDocument.addField(SearchFields.FILE_CONTENT_TYPE, fileMetadata.getDataFile().getContentType());
                     datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_SEARCHABLE, fileMetadata.getDataFile().getFriendlyType());
-                    // For the file type facets, we have a property file that maps mime types 
+                    // For the file type facets, we have a property file that maps mime types
                     // to facet-friendly names; "application/fits" should become "FITS", etc.:
                     datafileSolrInputDocument.addField(SearchFields.FILE_TYPE, FileUtil.getFacetFileType(fileMetadata.getDataFile()));
                     datafileSolrInputDocument.addField(SearchFields.FILE_TYPE_SEARCHABLE, FileUtil.getFacetFileType(fileMetadata.getDataFile()));
@@ -982,31 +1090,33 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
                     datafileSolrInputDocument.addField(SearchFields.FILE_CHECKSUM_VALUE, fileMetadata.getDataFile().getChecksumValue());
                     datafileSolrInputDocument.addField(SearchFields.DESCRIPTION, fileMetadata.getDescription());
                     datafileSolrInputDocument.addField(SearchFields.FILE_DESCRIPTION, fileMetadata.getDescription());
-                    datafileSolrInputDocument.addField(SearchFields.FILE_PERSISTENT_ID, fileMetadata.getDataFile().getGlobalIdString());
+                    datafileSolrInputDocument.addField(SearchFields.FILE_PERSISTENT_ID, fileMetadata.getDataFile().getGlobalId().toString());
                     datafileSolrInputDocument.addField(SearchFields.UNF, fileMetadata.getDataFile().getUnf());
                     datafileSolrInputDocument.addField(SearchFields.SUBTREE, dataversePaths);
-//            datafileSolrInputDocument.addField(SearchFields.HOST_DATAVERSE, dataFile.getOwner().getOwner().getName());
-                    // datafileSolrInputDocument.addField(SearchFields.PARENT_NAME, dataFile.getDataset().getTitle());
+                    // datafileSolrInputDocument.addField(SearchFields.HOST_DATAVERSE,
+                    // dataFile.getOwner().getOwner().getName());
+                    // datafileSolrInputDocument.addField(SearchFields.PARENT_NAME,
+                    // dataFile.getDataset().getTitle());
                     datafileSolrInputDocument.addField(SearchFields.PARENT_ID, fileMetadata.getDataFile().getOwner().getId());
-                    datafileSolrInputDocument.addField(SearchFields.PARENT_IDENTIFIER, fileMetadata.getDataFile().getOwner().getGlobalIdString());
+                    datafileSolrInputDocument.addField(SearchFields.PARENT_IDENTIFIER, fileMetadata.getDataFile().getOwner().getGlobalId().toString());
                     datafileSolrInputDocument.addField(SearchFields.PARENT_CITATION, fileMetadata.getDataFile().getOwner().getCitation());
 
                     datafileSolrInputDocument.addField(SearchFields.PARENT_NAME, parentDatasetTitle);
 
                     // If this is a tabular data file -- i.e., if there are data
-                    // variables associated with this file, we index the variable 
-                    // names and labels: 
+                    // variables associated with this file, we index the variable
+                    // names and labels:
                     if (fileMetadata.getDataFile().isTabularData()) {
                         List variables = fileMetadata.getDataFile().getDataTable().getDataVariables();
                         for (DataVariable var : variables) {
-                            // Hard-coded search fields, for now: 
+                            // Hard-coded search fields, for now:
                             // TODO: eventually: review, decide how datavariables should
                             // be handled for indexing purposes. (should it be a fixed
                             // setup, defined in the code? should it be flexible? unlikely
                             // that this needs to be domain-specific... since these data
                             // variables are quite specific to tabular data, which in turn
                             // is something social science-specific...
-                            // anyway -- needs to be reviewed. -- L.A. 4.0alpha1 
+                            // anyway -- needs to be reviewed. -- L.A. 4.0alpha1
 
                             if (var.getName() != null && !var.getName().equals("")) {
                                 datafileSolrInputDocument.addField(SearchFields.VARIABLE_NAME, var.getName());
@@ -1043,16 +1153,18 @@ private String addOrUpdateDataset(IndexableDataset indexableDataset) {
         }
 
         Long dsId = dataset.getId();
-        ///Dataset updatedDataset = (Dataset)dvObjectService.updateContentIndexTime(dataset);
-        ///updatedDataset = null;
-        // instead of making a call to dvObjectService, let's try and 
+        /// Dataset updatedDataset =
+        /// (Dataset)dvObjectService.updateContentIndexTime(dataset);
+        /// updatedDataset = null;
+        // instead of making a call to dvObjectService, let's try and
         // modify the index time stamp using the local EntityManager:
         DvObject dvObjectToModify = em.find(DvObject.class, dsId);
         dvObjectToModify.setIndexTime(new Timestamp(new Date().getTime()));
         dvObjectToModify = em.merge(dvObjectToModify);
         dvObjectToModify = null;
 
-//        return "indexed dataset " + dataset.getId() + " as " + solrDocId + "\nindexFilesResults for " + solrDocId + ":" + fileInfo.toString();
+        // return "indexed dataset " + dataset.getId() + " as " + solrDocId +
+        // "\nindexFilesResults for " + solrDocId + ":" + fileInfo.toString();
         return "indexed dataset " + dsId + " as " + datasetSolrDocId + ". filesIndexed: " + filesIndexed;
     }
 
@@ -1191,7 +1303,7 @@ public String delete(Dataverse doomed) {
      * https://github.com/IQSS/dataverse/issues/142
      */
     public String removeSolrDocFromIndex(String doomed) {
-        
+
         logger.fine("deleting Solr document: " + doomed);
         UpdateResponse updateResponse;
         try {
@@ -1213,7 +1325,7 @@ public String convertToFriendlyDate(Date dateAsDate) {
         if (dateAsDate == null) {
             dateAsDate = new Date();
         }
-        //  using DateFormat.MEDIUM for May 5, 2014 to match what's in DVN 3.x
+        // using DateFormat.MEDIUM for May 5, 2014 to match what's in DVN 3.x
         DateFormat format = DateFormat.getDateInstance(DateFormat.MEDIUM);
         String friendlyDate = format.format(dateAsDate);
         return friendlyDate;
@@ -1461,37 +1573,36 @@ private List findFilesOfParentDataset(long parentDatasetId) throws Searc
         }
         return dvObjectInSolrOnly;
     }
-    
+
     // This is a convenience method for deleting all the SOLR documents
     // (Datasets and DataFiles) harvested by a specific HarvestingClient.
-    // The delete logic is a bit simpler, than when deleting "real", local 
+    // The delete logic is a bit simpler, than when deleting "real", local
     // datasets and files - for example, harvested datasets are never Drafts, etc.
-    // We are also less concerned with the diagnostics; if any of it fails, 
-    // we don't need to treat it as a fatal condition. 
+    // We are also less concerned with the diagnostics; if any of it fails,
+    // we don't need to treat it as a fatal condition.
     public void deleteHarvestedDocuments(HarvestingClient harvestingClient) {
         List solrIdsOfDatasetsToDelete = new ArrayList<>();
-        
+
         // I am going to make multiple solrIndexService.deleteMultipleSolrIds() calls;
-        // one call for the list of datafiles in each dataset; then one more call to 
-        // delete all the dataset documents. 
-        // I'm *assuming* this is safer than to try and make one complete list of 
-        // all the documents (datasets and datafiles), and then attempt to delete 
-        // them all at once... (is there a limit??) The list can be huge - if the 
-        // harvested archive is on the scale of Odum or ICPSR, with thousands of 
-        // datasets and tens of thousands of files. 
-        // 
-        
+        // one call for the list of datafiles in each dataset; then one more call to
+        // delete all the dataset documents.
+        // I'm *assuming* this is safer than to try and make one complete list of
+        // all the documents (datasets and datafiles), and then attempt to delete
+        // them all at once... (is there a limit??) The list can be huge - if the
+        // harvested archive is on the scale of Odum or ICPSR, with thousands of
+        // datasets and tens of thousands of files.
+        //
         for (Dataset harvestedDataset : harvestingClient.getHarvestedDatasets()) {
             solrIdsOfDatasetsToDelete.add(solrDocIdentifierDataset + harvestedDataset.getId());
-            
+
             List solrIdsOfDatafilesToDelete = new ArrayList<>();
             for (DataFile datafile : harvestedDataset.getFiles()) {
                 solrIdsOfDatafilesToDelete.add(solrDocIdentifierFile + datafile.getId());
             }
             logger.fine("attempting to delete the following datafiles from the index: " + StringUtils.join(solrIdsOfDatafilesToDelete, ","));
             IndexResponse resultOfAttemptToDeleteFiles = solrIndexService.deleteMultipleSolrIds(solrIdsOfDatafilesToDelete);
-            logger.fine("result of an attempted delete of the harvested files associated with the dataset "+harvestedDataset.getId()+": "+resultOfAttemptToDeleteFiles);
-            
+            logger.fine("result of an attempted delete of the harvested files associated with the dataset " + harvestedDataset.getId() + ": " + resultOfAttemptToDeleteFiles);
+
         }
 
         logger.fine("attempting to delete the following datasets from the index: " + StringUtils.join(solrIdsOfDatasetsToDelete, ","));
@@ -1499,22 +1610,21 @@ public void deleteHarvestedDocuments(HarvestingClient harvestingClient) {
         logger.fine("result of attempt to delete harvested datasets associated with the client: " + resultOfAttemptToDeleteDatasets + "\n");
 
     }
-    
+
     // Another convenience method, for deleting all the SOLR documents (dataset_
-    // and datafile_s) associated with a harveste dataset. The comments for the 
+    // and datafile_s) associated with a harveste dataset. The comments for the
     // method above apply here too.
     public void deleteHarvestedDocuments(Dataset harvestedDataset) {
-        List solrIdsOfDocumentsToDelete = new ArrayList<>();   
+        List solrIdsOfDocumentsToDelete = new ArrayList<>();
         solrIdsOfDocumentsToDelete.add(solrDocIdentifierDataset + harvestedDataset.getId());
-        
+
         for (DataFile datafile : harvestedDataset.getFiles()) {
-                solrIdsOfDocumentsToDelete.add(solrDocIdentifierFile + datafile.getId());
+            solrIdsOfDocumentsToDelete.add(solrDocIdentifierFile + datafile.getId());
         }
-        
+
         logger.fine("attempting to delete the following documents from the index: " + StringUtils.join(solrIdsOfDocumentsToDelete, ","));
         IndexResponse resultOfAttemptToDeleteDocuments = solrIndexService.deleteMultipleSolrIds(solrIdsOfDocumentsToDelete);
         logger.fine("result of attempt to delete harvested documents: " + resultOfAttemptToDeleteDocuments + "\n");
     }
-    
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java
index cbceb855cd1..d5a5b92a502 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java
@@ -10,6 +10,9 @@
  * http://localhost:8080/api/admin/index/solr/schema` into the file in the
  * source tree when a metadata block update warrants it.
  *
+ * This process of updating schema.xml for new metadata block fields documented
+ * at doc/sphinx-guides/source/admin/metadatacustomization.rst
+ *
  * Generally speaking, we want the search fields to be readable. This is a
  * challenge for long field names but a power user should be able to type
  * "authorAffiliation:Harvard" into the general search box. A regular user is
@@ -90,9 +93,11 @@ public class SearchFields {
     public static final String PERSISTENT_URL = "persistentUrl";
     public static final String UNF = "unf";
     public static final String DATAVERSE_NAME = "dvName";
+    public static final String DATAVERSE_ALIAS = "dvAlias";
     public static final String DATAVERSE_AFFILIATION = "dvAffiliation";
     public static final String DATAVERSE_DESCRIPTION = "dvDescription";
     public static final String DATAVERSE_CATEGORY = "dvCategory";
+    
     /**
      * What is dvSubject_en for? How does it get populated into Solr? The
      * behavior changed so that now the subjects of dataverses are based on
@@ -112,6 +117,20 @@ public class SearchFields {
      * could have a convention like "subjectFacet" for the facets?
      */
     public static final String SUBJECT = "subject_ss";
+    
+    /*
+     * The category of the Dataverse (aka Dataverse Type). Named differently
+     * than DATAVERSE_CATEGORY so it can be searched but doesn't show up on the
+     * homepage facet
+     */
+    public static final String CATEGORY_OF_DATAVERSE = "categoryOfDataverse";
+    
+    /*
+     * The alias of the dataverse. This named differently because IDENTIFIER
+     * is used for dataset for its own identifier.
+     */
+    public static final String IDENTIFIER_OF_DATAVERSE = "identifierOfDataverse";
+    
     /**
      * @todo think about how to tie the fact that this needs to be multivalued
      * (_ss) because a multivalued facet (authorAffilition_ss) will be collapsed
@@ -234,5 +253,6 @@ more targeted results for just datasets. The format is YYYY (i.e.
 
     public static final String VARIABLE_NAME = "variableName";
     public static final String VARIABLE_LABEL = "variableLabel";
+    public static final String FULL_TEXT = "_text_";
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java
index 60f35f39159..c3c06fcb1ac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchFilesServiceBean.java
@@ -42,9 +42,11 @@ public FileView getFileView(DatasetVersion datasetVersion, User user, String use
         boolean onlyDataRelatedToMe = false;
         int numResultsPerPage = 25;
         SolrQueryResponse solrQueryResponse = null;
+        List dataverses = new ArrayList<>();
+        dataverses.add(dataverse);
         try {
             HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
-            solrQueryResponse = searchService.search(new DataverseRequest(user, httpServletRequest), dataverse, finalQuery, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage);
+            solrQueryResponse = searchService.search(new DataverseRequest(user, httpServletRequest), dataverses, finalQuery, filterQueries, sortField, sortOrder, paginationStart, onlyDataRelatedToMe, numResultsPerPage);
         } catch (SearchException ex) {
             logger.info(SearchException.class + " searching for files: " + ex);
             return null;
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
index 91c1e6dd9c8..da7a40eecc1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -331,14 +331,16 @@ public void search(boolean onlyDataRelatedToMe) {
             int numRows = 10;
             HttpServletRequest httpServletRequest = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
             DataverseRequest dataverseRequest = new DataverseRequest(session.getUser(), httpServletRequest);
-            solrQueryResponse = searchService.search(dataverseRequest, dataverse, queryToPassToSolr, filterQueriesFinal, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false);
+            List dataverses = new ArrayList<>();
+            dataverses.add(dataverse);
+            solrQueryResponse = searchService.search(dataverseRequest, dataverses, queryToPassToSolr, filterQueriesFinal, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false);
             if (solrQueryResponse.hasError()){
                 logger.info(solrQueryResponse.getError());
                 setSolrErrorEncountered(true);
             }
             // This 2nd search() is for populating the facets: -- L.A. 
             // TODO: ...
-            solrQueryResponseAllTypes = searchService.search(dataverseRequest, dataverse, queryToPassToSolr, filterQueriesFinalAllTypes, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false);
+            solrQueryResponseAllTypes = searchService.search(dataverseRequest, dataverses, queryToPassToSolr, filterQueriesFinalAllTypes, sortField, sortOrder.toString(), paginationStart, onlyDataRelatedToMe, numRows, false);
             if (solrQueryResponse.hasError()){
                 logger.info(solrQueryResponse.getError());
                 setSolrErrorEncountered(true);
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
index 48e1fa4f8bb..45fa189787a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -96,7 +96,7 @@ public void close() {
             solrServer = null;
         }
     }
-
+    
     /**
      * Import note: "onlyDatatRelatedToMe" relies on filterQueries for providing
      * access to Private Data for the correct user
@@ -106,7 +106,7 @@ public void close() {
      *
      *
      * @param dataverseRequest
-     * @param dataverse
+     * @param dataverses
      * @param query
      * @param filterQueries
      * @param sortField
@@ -117,8 +117,8 @@ public void close() {
      * @return
      * @throws SearchException
      */
-    public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dataverse, String query, List filterQueries, String sortField, String sortOrder, int paginationStart, boolean onlyDatatRelatedToMe, int numResultsPerPage) throws SearchException {
-        return search(dataverseRequest, dataverse, query, filterQueries, sortField, sortOrder, paginationStart, onlyDatatRelatedToMe, numResultsPerPage, true);
+    public SolrQueryResponse search(DataverseRequest dataverseRequest, List dataverses, String query, List filterQueries, String sortField, String sortOrder, int paginationStart, boolean onlyDatatRelatedToMe, int numResultsPerPage) throws SearchException {
+        return search(dataverseRequest, dataverses, query, filterQueries, sortField, sortOrder, paginationStart, onlyDatatRelatedToMe, numResultsPerPage, true);
     }
     
     /**
@@ -129,8 +129,8 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
      * related to permissions
      *
      *
-     * @param user
-     * @param dataverse
+     * @param dataverseRequest
+     * @param dataverses
      * @param query
      * @param filterQueries
      * @param sortField
@@ -142,7 +142,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
      * @return
      * @throws SearchException
      */
-    public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dataverse, String query, List filterQueries, String sortField, String sortOrder, int paginationStart, boolean onlyDatatRelatedToMe, int numResultsPerPage, boolean retrieveEntities) throws SearchException {
+    public SolrQueryResponse search(DataverseRequest dataverseRequest, List dataverses, String query, List filterQueries, String sortField, String sortOrder, int paginationStart, boolean onlyDatatRelatedToMe, int numResultsPerPage, boolean retrieveEntities) throws SearchException {
 
         if (paginationStart < 0) {
             throw new IllegalArgumentException("paginationStart must be 0 or greater");
@@ -217,13 +217,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
             solrQuery.addFilterQuery(filterQuery);
         }
 
-        // -----------------------------------
-        // PERMISSION FILTER QUERY
-        // -----------------------------------
-        String permissionFilterQuery = this.getPermissionFilterQuery(dataverseRequest, solrQuery, dataverse, onlyDatatRelatedToMe);
-        if (permissionFilterQuery != null) {
-            solrQuery.addFilterQuery(permissionFilterQuery);
-        }
+
 
         // -----------------------------------
         // Facets to Retrieve
@@ -249,12 +243,31 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
          * if advancedSearchField is true or false
          *
          */
-        if (dataverse != null) {
-            for (DataverseFacet dataverseFacet : dataverse.getDataverseFacets()) {
-                DatasetFieldType datasetField = dataverseFacet.getDatasetFieldType();
-                solrQuery.addFacetField(datasetField.getSolrField().getNameFacetable());
+        
+        //I'm not sure if just adding null here is good for hte permissions system... i think it needs something
+        if(dataverses != null) {
+            for(Dataverse dataverse : dataverses) {
+                // -----------------------------------
+                // PERMISSION FILTER QUERY
+                // -----------------------------------
+                String permissionFilterQuery = this.getPermissionFilterQuery(dataverseRequest, solrQuery, dataverse, onlyDatatRelatedToMe);
+                if (permissionFilterQuery != null) {
+                    solrQuery.addFilterQuery(permissionFilterQuery);
+                }
+                if (dataverse != null) {
+                    for (DataverseFacet dataverseFacet : dataverse.getDataverseFacets()) {
+                        DatasetFieldType datasetField = dataverseFacet.getDatasetFieldType();
+                        solrQuery.addFacetField(datasetField.getSolrField().getNameFacetable());
+                    }
+                }
+            }
+        } else {
+            String permissionFilterQuery = this.getPermissionFilterQuery(dataverseRequest, solrQuery, null, onlyDatatRelatedToMe);
+            if (permissionFilterQuery != null) {
+                solrQuery.addFilterQuery(permissionFilterQuery);
             }
         }
+        
         solrQuery.addFacetField(SearchFields.FILE_TYPE);
         /**
          * @todo: hide the extra line this shows in the GUI... at least it's
@@ -365,6 +378,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
         Map staticSolrFieldFriendlyNamesBySolrField = new HashMap<>();
         String baseUrl = systemConfig.getDataverseSiteUrl();
 
+        //Going through the results
         for (SolrDocument solrDocument : docs) {
             String id = (String) solrDocument.getFieldValue(SearchFields.ID);
             Long entityid = (Long) solrDocument.getFieldValue(SearchFields.ENTITY_ID);
@@ -388,6 +402,9 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
             Date release_or_create_date = (Date) solrDocument.getFieldValue(SearchFields.RELEASE_OR_CREATE_DATE);
             String dateToDisplayOnCard = (String) solrDocument.getFirstValue(SearchFields.RELEASE_OR_CREATE_DATE_SEARCHABLE_TEXT);
             String dvTree = (String) solrDocument.getFirstValue(SearchFields.SUBTREE);
+            String identifierOfDataverse = (String) solrDocument.getFieldValue(SearchFields.IDENTIFIER_OF_DATAVERSE);
+            String nameOfDataverse = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_NAME);
+
             List matchedFields = new ArrayList<>();
             List highlights = new ArrayList<>();
             Map highlightsMap = new HashMap<>();
@@ -496,6 +513,10 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, Dataverse dat
 
                 solrSearchResult.setCitation(citation);
                 solrSearchResult.setCitationHtml(citationPlainHtml);
+                
+                solrSearchResult.setIdentifierOfDataverse(identifierOfDataverse);
+                solrSearchResult.setNameOfDataverse(nameOfDataverse);
+                
                 if (title != null) {
 //                    solrSearchResult.setTitle((String) titles.get(0));
                     solrSearchResult.setTitle(title);
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
index 341ebd7492b..549ddf32070 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java
@@ -5,6 +5,7 @@
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.api.Util;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
+import edu.harvard.iq.dataverse.util.DateUtil;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import java.util.ArrayList;
@@ -108,6 +109,9 @@ public class SolrSearchResult {
     private List fileCategories = null;
     private List tabularDataTags = null;
     
+    private String identifierOfDataverse = null;
+    private String nameOfDataverse = null;
+    
     public String getDvTree() {
         return dvTree;
     }
@@ -520,6 +524,8 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
                 .add("dataset_citation", datasetCitation)
                 .add("deaccession_reason", this.deaccessionReason)
                 .add("citationHtml", this.citationHtml)
+                .add("identifier_of_dataverse", this.identifierOfDataverse)
+                .add("name_of_dataverse", this.nameOfDataverse)
                 .add("citation", this.citation);
         // Now that nullSafeJsonBuilder has been instatiated, check for null before adding to it!
         if (showRelevance) {
@@ -880,7 +886,7 @@ public void setReleaseOrCreateDate(Date releaseOrCreateDate) {
     }
 
     public String getDateToDisplayOnCard() {
-        return dateToDisplayOnCard;
+        return DateUtil.formatDate(dateToDisplayOnCard,"MMM dd, yyyy");
     }
 
     public void setDateToDisplayOnCard(String dateToDisplayOnCard) {
@@ -1064,5 +1070,19 @@ public void setUserRole(List userRole) {
         this.userRole = userRole;
     }
 
-
+    public String getIdentifierOfDataverse() {
+        return identifierOfDataverse;
+    }
+    
+    public void setIdentifierOfDataverse(String id) {
+        this.identifierOfDataverse = id;
+    }
+    
+    public String getNameOfDataverse() {
+        return nameOfDataverse;
+    }
+    
+    public void setNameOfDataverse(String id) {
+        this.nameOfDataverse = id;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java
index 004e937b425..70cc384e1d0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/savedsearch/SavedSearchServiceBean.java
@@ -19,6 +19,7 @@
 import edu.harvard.iq.dataverse.search.SearchException;
 import edu.harvard.iq.dataverse.search.SearchFields;
 import edu.harvard.iq.dataverse.search.SortBy;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
@@ -205,9 +206,11 @@ private SolrQueryResponse findHits(SavedSearch savedSearch) throws SearchExcepti
         int paginationStart = 0;
         boolean dataRelatedToMe = false;
         int numResultsPerPage = Integer.MAX_VALUE;
+        List dataverses = new ArrayList<>();
+        dataverses.add(savedSearch.getDefinitionPoint());
         SolrQueryResponse solrQueryResponse = searchService.search(
                 new DataverseRequest(savedSearch.getCreator(), getHttpServletRequest()),
-                savedSearch.getDefinitionPoint(),
+                dataverses,
                 savedSearch.getQuery(),
                 savedSearch.getFilterQueriesAsStrings(),
                 sortBy.getField(),
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
index b8bc893fccb..1f6e109068f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
@@ -170,6 +170,9 @@ public enum Key {
         SearchRespectPermissionRoot,
         /** Solr hostname and port, such as "localhost:8983". */
         SolrHostColonPort,
+        /** Enable full-text indexing in solr up to max file size */
+        SolrFullTextIndexing, //true or false (default)
+        SolrMaxFileSizeForFullTextIndexing, //long - size in bytes (default unset/no limit)
         /** Key for limiting the number of bytes uploaded via the Data Deposit API, UI (web site and . */
         MaxFileUploadSizeInBytes,
         /** Key for if ScrubMigrationData is enabled or disabled. */
@@ -365,7 +368,15 @@ Whether Harvesting (OAI) service is enabled
         /**
          * 
          */
-        FilePIDsEnabled
+        FilePIDsEnabled,
+        /**
+         * A comma-separated list of roles for which new dataverses should inherit the
+         * corresponding role assignments from the parent dataverse. Also affects
+         * /api/admin/dataverse/{alias}/addRolesToChildren. Default is "", no
+         * inheritance. "*" means inherit assignments for all roles
+         */
+        InheritParentRoleAssignments
+        
         ;
 
         @Override
diff --git a/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java
new file mode 100644
index 00000000000..14db98e540e
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapServiceBean.java
@@ -0,0 +1,17 @@
+package edu.harvard.iq.dataverse.sitemap;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import java.util.List;
+import javax.ejb.Asynchronous;
+import javax.ejb.Stateless;
+
+@Stateless
+public class SiteMapServiceBean {
+
+    @Asynchronous
+    public void updateSiteMap(List dataverses, List datasets) {
+        SiteMapUtil.updateSiteMap(dataverses, datasets);
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java
new file mode 100644
index 00000000000..e32b811ee2c
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtil.java
@@ -0,0 +1,225 @@
+package edu.harvard.iq.dataverse.sitemap;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.DvObjectContainer;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.xml.XmlValidator;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.logging.Logger;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+public class SiteMapUtil {
+
+    private static final Logger logger = Logger.getLogger(SiteMapUtil.class.getCanonicalName());
+
+    static final String SITEMAP_FILENAME_FINAL = "sitemap.xml";
+    static final String SITEMAP_FILENAME_STAGED = "sitemap.xml.staged";
+
+    /**
+     * TODO: Handle more than 50,000 entries in the sitemap.
+     *
+     * (As of this writing Harvard Dataverse only has ~3000 dataverses and
+     * ~30,000 datasets.)
+     *
+     * "each Sitemap file that you provide must have no more than 50,000 URLs"
+     * https://www.sitemaps.org/protocol.html
+     *
+     * Consider using a third party library: "One sitemap can contain a maximum
+     * of 50,000 URLs. (Some sitemaps, like Google News sitemaps, can contain
+     * only 1,000 URLs.) If you need to put more URLs than that in a sitemap,
+     * you'll have to use a sitemap index file. Fortunately, WebSitemapGenerator
+     * can manage the whole thing for you."
+     * https://github.com/dfabulich/sitemapgen4j
+     */
+    public static void updateSiteMap(List dataverses, List datasets) {
+
+        logger.info("BEGIN updateSiteMap");
+
+        String sitemapPathString = getSitemapPathString();
+        String stagedSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_STAGED;
+        String finalSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_FINAL;
+
+        Path stagedPath = Paths.get(stagedSitemapPathAndFileString);
+        if (Files.exists(stagedPath)) {
+            logger.warning("Unable to update sitemap! The staged file from a previous run already existed. Delete " + stagedSitemapPathAndFileString + " and try again.");
+            return;
+        }
+
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder documentBuilder = null;
+        try {
+            documentBuilder = documentBuilderFactory.newDocumentBuilder();
+        } catch (ParserConfigurationException ex) {
+            logger.warning("Unable to update sitemap! ParserConfigurationException: " + ex.getLocalizedMessage());
+            return;
+        }
+        Document document = documentBuilder.newDocument();
+
+        Element urlSet = document.createElement("urlset");
+        urlSet.setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
+        urlSet.setAttribute("xmlns:xhtml", "http://www.w3.org/1999/xhtml");
+        document.appendChild(urlSet);
+
+        for (Dataverse dataverse : dataverses) {
+            if (!dataverse.isReleased()) {
+                continue;
+            }
+            Element url = document.createElement("url");
+            urlSet.appendChild(url);
+
+            Element loc = document.createElement("loc");
+            String dataverseAlias = dataverse.getAlias();
+            loc.appendChild(document.createTextNode(SystemConfig.getDataverseSiteUrlStatic() + "/dataverse/" + dataverseAlias));
+            url.appendChild(loc);
+
+            Element lastmod = document.createElement("lastmod");
+            lastmod.appendChild(document.createTextNode(getLastModDate(dataverse)));
+            url.appendChild(lastmod);
+        }
+
+        for (Dataset dataset : datasets) {
+            if (!dataset.isReleased()) {
+                continue;
+            }
+            if (dataset.isHarvested()) {
+                continue;
+            }
+            // The deaccessioned check is last because it has to iterate through dataset versions.
+            if (dataset.isDeaccessioned()) {
+                continue;
+            }
+            Element url = document.createElement("url");
+            urlSet.appendChild(url);
+
+            Element loc = document.createElement("loc");
+            String datasetPid = dataset.getGlobalId().asString();
+            loc.appendChild(document.createTextNode(SystemConfig.getDataverseSiteUrlStatic() + "/dataset.xhtml?persistentId=" + datasetPid));
+            url.appendChild(loc);
+
+            Element lastmod = document.createElement("lastmod");
+            lastmod.appendChild(document.createTextNode(getLastModDate(dataset)));
+            url.appendChild(lastmod);
+        }
+
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        Transformer transformer = null;
+        try {
+            transformer = transformerFactory.newTransformer();
+        } catch (TransformerConfigurationException ex) {
+            logger.warning("Unable to update sitemap! TransformerConfigurationException: " + ex.getLocalizedMessage());
+            return;
+        }
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+        DOMSource source = new DOMSource(document);
+        File directory = new File(sitemapPathString);
+        if (!directory.exists()) {
+            directory.mkdir();
+        }
+
+        boolean debug = false;
+        if (debug) {
+            logger.info("Writing sitemap to console/logs");
+            StreamResult consoleResult = new StreamResult(System.out);
+            try {
+                transformer.transform(source, consoleResult);
+            } catch (TransformerException ex) {
+                logger.warning("Unable to print sitemap to the console: " + ex.getLocalizedMessage());
+            }
+        }
+
+        logger.info("Writing staged sitemap to " + stagedSitemapPathAndFileString);
+        StreamResult result = new StreamResult(new File(stagedSitemapPathAndFileString));
+        try {
+            transformer.transform(source, result);
+        } catch (TransformerException ex) {
+            logger.warning("Unable to update sitemap! Unable to write staged sitemap to " + stagedSitemapPathAndFileString + ". TransformerException: " + ex.getLocalizedMessage());
+            return;
+        }
+
+        logger.info("Checking staged sitemap for well-formedness. The staged file is " + stagedSitemapPathAndFileString);
+        try {
+            XmlValidator.validateXmlWellFormed(stagedSitemapPathAndFileString);
+        } catch (Exception ex) {
+            logger.warning("Unable to update sitemap! Staged sitemap file is not well-formed XML! The exception for " + stagedSitemapPathAndFileString + " is " + ex.getLocalizedMessage());
+            return;
+        }
+
+        logger.info("Checking staged sitemap against XML schema. The staged file is " + stagedSitemapPathAndFileString);
+        URL schemaUrl = null;
+        try {
+            schemaUrl = new URL("https://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd");
+        } catch (MalformedURLException ex) {
+            // This URL is hard coded and it's fine. We should never get MalformedURLException so we just swallow the exception and carry on.
+        }
+        try {
+            XmlValidator.validateXmlSchema(stagedSitemapPathAndFileString, schemaUrl);
+        } catch (SAXException | IOException ex) {
+            logger.warning("Unable to update sitemap! Exception caught while checking XML staged file (" + stagedSitemapPathAndFileString + " ) against XML schema: " + ex.getLocalizedMessage());
+            return;
+        }
+
+        Path finalPath = Paths.get(finalSitemapPathAndFileString);
+        logger.info("Copying staged sitemap from " + stagedSitemapPathAndFileString + " to " + finalSitemapPathAndFileString);
+        try {
+            Files.move(stagedPath, finalPath, StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException ex) {
+            logger.warning("Unable to update sitemap! Unable to copy staged sitemap from " + stagedSitemapPathAndFileString + " to " + finalSitemapPathAndFileString + ". IOException: " + ex.getLocalizedMessage());
+            return;
+        }
+
+        logger.info("END updateSiteMap");
+    }
+
+    private static String getLastModDate(DvObjectContainer dvObjectContainer) {
+        // TODO: Decide if YYYY-MM-DD is enough. https://www.sitemaps.org/protocol.html
+        // says "The date of last modification of the file. This date should be in W3C Datetime format.
+        // This format allows you to omit the time portion, if desired, and use YYYY-MM-DD."
+        return new SimpleDateFormat("yyyy-MM-dd").format(dvObjectContainer.getModificationTime());
+    }
+
+    public static boolean stageFileExists() {
+        String sitemapPathString = getSitemapPathString();
+        String stagedSitemapPathAndFileString = sitemapPathString + File.separator + SITEMAP_FILENAME_STAGED;
+        Path stagedPath = Paths.get(stagedSitemapPathAndFileString);
+        if (Files.exists(stagedPath)) {
+            logger.warning("Unable to update sitemap! The staged file from a previous run already existed. Delete " + stagedSitemapPathAndFileString + " and try again.");
+            return true;
+        }
+        return false;
+    }
+
+    private static String getSitemapPathString() {
+        String sitemapPathString = "/tmp";
+        // i.e. /usr/local/glassfish4/glassfish/domains/domain1
+        String domainRoot = System.getProperty("com.sun.aas.instanceRoot");
+        if (domainRoot != null) {
+            // Note that we write to a directory called "sitemap" but we serve just "/sitemap.xml" using PrettyFaces.
+            sitemapPathString = domainRoot + File.separator + "docroot" + File.separator + "sitemap";
+        }
+        return sitemapPathString;
+
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java
index 839c0022ee2..c1c3741e171 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java
@@ -6,7 +6,11 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.text.MessageFormat;
-import java.util.*;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class BundleUtil {
@@ -21,7 +25,49 @@ public static String getStringFromBundle(String key) {
     }
 
     public static String getStringFromBundle(String key, List arguments) {
+        ResourceBundle bundle = getResourceBundle(defaultBundleFile );
+        return getStringFromBundle(key, arguments, bundle);
+    }
+    
+    public static String getStringFromBundle(String key, List arguments, ResourceBundle bundle) {
+        try {
+          return getStringFromBundleNoMissingCheck(key, arguments, bundle);
+        } catch (MissingResourceException ex) {
+            logger.warning("Could not find key \"" + key + "\" in bundle file: ");
+            logger.log(Level.CONFIG, ex.getMessage(), ex);
+            return null;
+        }
+    }
+    
+    /**
+     * This call was added to allow bypassing the exception catch, for filetype indexing needs the exception to bubble up
+     * --MAD 4.9.4
+     */
+    private static String getStringFromBundleNoMissingCheck(String key, List arguments, ResourceBundle bundle) throws MissingResourceException {
+        if (key == null || key.isEmpty()) {
+            return null;
+        }
+        String stringFromBundle = null;
+
+        stringFromBundle = bundle.getString(key);
+        logger.fine("string found: " + stringFromBundle);
+            
+        if (arguments != null) {
+            Object[] argArray = new String[arguments.size()];
+            argArray = arguments.toArray(argArray);
+            return MessageFormat.format(stringFromBundle, argArray);
+        } else {
+            return stringFromBundle;
+        }
+    }
 
+    public static String getStringFromPropertyFile(String key, String propertyFileName  ) throws MissingResourceException {
+        ResourceBundle bundle = getResourceBundle(propertyFileName);
+        return getStringFromBundleNoMissingCheck(key, null, bundle);
+    }
+
+    public static ResourceBundle getResourceBundle(String propertyFileName)
+    {
         DataverseLocaleBean d = new DataverseLocaleBean();
         ResourceBundle bundle;
         bundle_locale = new Locale(d.getLocaleCode());
@@ -29,7 +75,7 @@ public static String getStringFromBundle(String key, List arguments) {
         String filesRootDirectory = System.getProperty("dataverse.lang.directory");
 
         if (filesRootDirectory == null || filesRootDirectory.isEmpty()) {
-            bundle = ResourceBundle.getBundle(defaultBundleFile, bundle_locale);
+            bundle = ResourceBundle.getBundle(propertyFileName, bundle_locale);
         } else {
             File bundleFileDir  = new File(filesRootDirectory);
             URL[] urls = null;
@@ -40,30 +86,9 @@ public static String getStringFromBundle(String key, List arguments) {
             }
 
             ClassLoader loader = new URLClassLoader(urls);
-            bundle = ResourceBundle.getBundle(defaultBundleFile, bundle_locale, loader);
+            bundle = ResourceBundle.getBundle(propertyFileName, bundle_locale, loader);
         }
-        return getStringFromBundle(key, arguments, bundle);
-    }
 
-    public static String getStringFromBundle(String key, List arguments, ResourceBundle bundle) {
-        if (key == null || key.isEmpty()) {
-            return null;
-        }
-        String stringFromBundle = null;
-        try {
-            stringFromBundle = bundle.getString(key);
-            logger.fine("string found: " + stringFromBundle);
-        } catch (MissingResourceException ex) {
-            logger.warning("Could not find key \"" + key + "\" in bundle file.");
-            return null;
-        }
-        if (arguments != null) {
-            Object[] argArray = new String[arguments.size()];
-            argArray = arguments.toArray(argArray);
-            return MessageFormat.format(stringFromBundle, argArray);
-        } else {
-            return stringFromBundle;
-        }
+        return bundle ;
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
new file mode 100644
index 00000000000..4009e199ea8
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -0,0 +1,65 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.DataverseLocaleBean;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ *
+ * @author jchengan
+ */
+public class DateUtil {
+
+    public static String formatDate(Date dateToformat) {
+        String formattedDate;
+        DateFormat dateFormatter;
+        try {
+            DataverseLocaleBean d = new DataverseLocaleBean();
+            Locale currentLocale = new Locale(d.getLocaleCode());
+            dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
+            formattedDate = dateFormatter.format(dateToformat);
+            return formattedDate;
+        } catch(Exception e) {
+            return null;
+        }
+    }
+
+    public static String formatDate(String dateToformat, String format) {
+        String formattedDate = "";
+        DateFormat inputFormat = new SimpleDateFormat(format);
+        Date _date = null;
+        try {
+            _date = inputFormat.parse(dateToformat);
+            formattedDate = formatDate(_date);
+            return formattedDate;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String formatDate(Timestamp datetimeToformat) {
+        String formattedDate;
+        DateFormat dateFormatter;
+        try {
+             DataverseLocaleBean d = new DataverseLocaleBean();
+             Locale currentLocale = new Locale(d.getLocaleCode());
+             dateFormatter = DateFormat.getDateTimeInstance(
+                                                     DateFormat.DEFAULT,
+                                                     DateFormat.LONG,
+                                                     currentLocale);
+             formattedDate = dateFormatter.format(datetimeToformat);
+
+             return formattedDate;
+         } catch (Exception e) {
+             e.printStackTrace();
+             return null;
+         }
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
index dcf6584fb51..3c890e53db1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -20,6 +20,7 @@
 
 package edu.harvard.iq.dataverse.util;
 
+
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFile.ChecksumType;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
@@ -27,6 +28,7 @@
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
+import static edu.harvard.iq.dataverse.dataaccess.S3AccessIO.S3_IDENTIFIER_PREFIX;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.datasetutility.FileExceedsMaxSizeException;
 import static edu.harvard.iq.dataverse.datasetutility.FileSizeChecker.bytesToHumanReadable;
@@ -43,8 +45,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.Charset;
@@ -57,11 +57,12 @@
 import java.sql.Timestamp;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
+import java.util.Map;
+import java.util.MissingResourceException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -91,7 +92,7 @@ public class FileUtil implements java.io.Serializable  {
     private static final String[] TABULAR_DATA_FORMAT_SET = {"POR", "SAV", "DTA", "RDA"};
     
     private static Map STATISTICAL_FILE_EXTENSION = new HashMap();
-   
+    
     /*
      * The following are Stata, SAS and SPSS syntax/control cards: 
      * These are recognized as text files (because they are!) so 
@@ -209,7 +210,7 @@ public static String getUserFriendlyFileType(DataFile dataFile) {
                 fileType = fileType.substring(0, fileType.indexOf(";"));
             }
             try {
-                return ResourceBundle.getBundle("MimeTypeDisplay").getString(fileType);
+                return BundleUtil.getStringFromPropertyFile(fileType,"MimeTypeDisplay" );
             } catch (MissingResourceException e) {
                 return fileType;
             }
@@ -227,7 +228,7 @@ public static String getFacetFileType(DataFile dataFile) {
             }
 
             try {
-                return ResourceBundle.getBundle("MimeTypeFacets").getString(fileType);
+                return BundleUtil.getStringFromPropertyFile(fileType,"MimeTypeFacets"  );
             } catch (MissingResourceException e) {
                 // if there's no defined "facet-friendly" form of this mime type
                 // we'll truncate the available type by "/", e.g., all the 
@@ -245,12 +246,22 @@ public static String getFacetFileType(DataFile dataFile) {
                 String typeClass = fileType.split("/")[0];
                 return Character.toUpperCase(typeClass.charAt(0)) + typeClass.substring(1);
             }
+        } else {
+            try {
+                return BundleUtil.getStringFromPropertyFile("application/octet-stream","MimeTypeFacets"  );
+            } catch (MissingResourceException ex) {
+                logger.warning("Could not find \"" + fileType + "\" in bundle file: ");
+                logger.log(Level.CONFIG, ex.getMessage(), ex);
+                return null;
+            }
         }
-        
-        return ResourceBundle.getBundle("MimeTypeFacets").getString("application/octet-stream");
     }
     
     public static String getUserFriendlyOriginalType(DataFile dataFile) {
+        if (!dataFile.isTabularData()) {
+            return null; 
+        }
+        
         String fileType = dataFile.getOriginalFileFormat();
          
         if (fileType != null && !fileType.equals("")) {
@@ -258,7 +269,7 @@ public static String getUserFriendlyOriginalType(DataFile dataFile) {
                 fileType = fileType.substring(0, fileType.indexOf(";"));
             }
             try {
-                return ResourceBundle.getBundle("MimeTypeDisplay").getString(fileType);
+                return BundleUtil.getStringFromPropertyFile(fileType,"MimeTypeDisplay" );
             } catch (MissingResourceException e) {
                 return fileType;
             }
@@ -1126,6 +1137,12 @@ public static String getFilesTempDirectory() {
         return filesTempDirectory;
     }
     
+    public static void generateS3PackageStorageIdentifier(DataFile dataFile) {
+        String bucketName = System.getProperty("dataverse.files.s3-bucket-name");
+        String storageId = S3_IDENTIFIER_PREFIX + "://" + bucketName + ":" + dataFile.getFileMetadata().getLabel();
+        dataFile.setStorageIdentifier(storageId);
+    }
+    
     public static void generateStorageIdentifier(DataFile dataFile) {
         dataFile.setStorageIdentifier(generateStorageIdentifier());
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java
index 67b8fba41f4..5b87b18573b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java
@@ -49,19 +49,4 @@ public > T enumValue( String param, Class enmClass, T defau
 			return defaultValue;
 		}
 	}
-
-    /**
-     * @deprecated Localization applies not only to the front end (JSF) but also
-     * the API so consider using the newer, more flexible BundleUtil methods
-     * instead.
-     */
-    @Deprecated
-    public String localize( String messageKey ) {
-        FacesContext facesContext = FacesContext.getCurrentInstance();
-        String messageBundleName = facesContext.getApplication().getMessageBundle();
-        Locale locale = facesContext.getViewRoot().getLocale();
-        ResourceBundle bundle = ResourceBundle.getBundle("Bundle", locale);
-        return bundle.getString(messageKey);
-    }
-    
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java b/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java
index 1431969cee9..01d1d9afc76 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java
@@ -25,20 +25,14 @@ public class LocalBundle extends ResourceBundle {
 
     public LocalBundle(){
         DataverseLocaleBean d = new DataverseLocaleBean();
-        bundle_locale= new Locale(d.getLocaleCode());
+        bundle_locale = new Locale(d.getLocaleCode());
 
         String filesRootDirectory = System.getProperty("dataverse.lang.directory");
-        if (filesRootDirectory == null || filesRootDirectory.isEmpty()) {
-            filesRootDirectory = "/tmp/lang";
-        }
-        File bundleFileDir = new File(filesRootDirectory);
 
-        if (!bundleFileDir.exists())
-        {
+        if (filesRootDirectory == null || filesRootDirectory.isEmpty()) {
             bundle = ResourceBundle.getBundle(defaultBundleFile, bundle_locale);
-        }
-        else {
-
+        } else {
+            File bundleFileDir  = new File(filesRootDirectory);
             URL[] urls = null;
             try {
                 urls = new URL[]{bundleFileDir.toURI().toURL()};
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
index 40a85c4ff59..fd059640780 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -68,6 +68,12 @@ public class SystemConfig {
      */
     public static final String FILES_DIRECTORY = "dataverse.files.directory";
 
+    /**
+     * Some installations may not want download URLs to their files to be
+     * available in Schema.org JSON-LD output.
+     */
+    public static final String FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS = "dataverse.files.hide-schema-dot-org-download-urls";
+
     /**
      * A JVM option to override the number of minutes for which a password reset
      * token is valid ({@link #minutesUntilPasswordResetTokenExpires}).
@@ -834,15 +840,21 @@ public int getPVNumberOfConsecutiveDigitsAllowed() {
      *
      * - TransferProtocols
      *
-     * There is a good chance these will be consolidated in the future. The word
-     * "NATIVE" is a bit of placeholder term to mean how Dataverse has
-     * traditionally handled files, which tends to involve users uploading and
-     * downloading files using a browser or APIs.
+     * There is a good chance these will be consolidated in the future.
      */
     public enum FileUploadMethods {
 
+        /**
+         * DCM stands for Data Capture Module. Right now it supports upload over
+         * rsync+ssh but DCM may support additional methods in the future.
+         */
         RSYNC("dcm/rsync+ssh"),
-        NATIVE("NATIVE");
+        /**
+         * Traditional Dataverse file handling, which tends to involve users
+         * uploading and downloading files using a browser or APIs.
+         */
+        NATIVE("native/http");
+
 
         private final String text;
 
@@ -881,7 +893,7 @@ public enum FileDownloadMethods {
          * go through Glassfish.
          */
         RSYNC("rsal/rsync"),
-        NATIVE("NATIVE");
+        NATIVE("native/http");
         private final String text;
 
         private FileDownloadMethods(final String text) {
@@ -969,16 +981,58 @@ public boolean isPublicInstall(){
     }
     
     public boolean isRsyncUpload(){
+        return getUploadMethodAvailable(SystemConfig.FileUploadMethods.RSYNC.toString());
+    }
+    
+    // Controls if HTTP upload is enabled for both GUI and API.
+    public boolean isHTTPUpload(){       
+        return getUploadMethodAvailable(SystemConfig.FileUploadMethods.NATIVE.toString());       
+    }
+    
+    public boolean isRsyncOnly(){       
+        String downloadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.DownloadMethods);
+        if(downloadMethods == null){
+            return false;
+        }
+        if (!downloadMethods.toLowerCase().equals(SystemConfig.FileDownloadMethods.RSYNC.toString())){
+            return false;
+        }
         String uploadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.UploadMethods);
-        return uploadMethods != null &&  uploadMethods.toLowerCase().equals(SystemConfig.FileUploadMethods.RSYNC.toString());
+        if (uploadMethods==null){
+            return false;
+        } else {
+           return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size() == 1 && uploadMethods.toLowerCase().equals(SystemConfig.FileUploadMethods.RSYNC.toString());
+        }        
+    }
+    
+    public boolean isRsyncDownload() {
+        String downloadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.DownloadMethods);
+        return downloadMethods !=null && downloadMethods.toLowerCase().contains(SystemConfig.FileDownloadMethods.RSYNC.toString());
     }
     
-    public boolean isRsyncDownload()
-    {
+    public boolean isHTTPDownload() {
         String downloadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.DownloadMethods);
-        return downloadMethods !=null && downloadMethods.toLowerCase().equals(SystemConfig.FileDownloadMethods.RSYNC.toString());
+        logger.warning("Download Methods:" + downloadMethods);
+        return downloadMethods !=null && downloadMethods.toLowerCase().contains(SystemConfig.FileDownloadMethods.NATIVE.toString());
     }
     
+    private Boolean getUploadMethodAvailable(String method){
+        String uploadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.UploadMethods); 
+        if (uploadMethods==null){
+            return false;
+        } else {
+           return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).contains(method);
+        }
+    }
+    
+    public Integer getUploadMethodCount(){
+        String uploadMethods = settingsService.getValueForKey(SettingsServiceBean.Key.UploadMethods); 
+        if (uploadMethods==null){
+            return 0;
+        } else {
+           return  Arrays.asList(uploadMethods.toLowerCase().split("\\s*,\\s*")).size();
+        }       
+    }
     public boolean isDataFilePIDSequentialDependent(){
         String doiIdentifierType = settingsService.getValueForKey(SettingsServiceBean.Key.IdentifierGenerationStyle, "randomString");
         String doiDataFileFormat = settingsService.getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java b/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java
new file mode 100644
index 00000000000..d0b1f28126b
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java
@@ -0,0 +1,381 @@
+package edu.harvard.iq.dataverse.util.bagit;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetField;
+import edu.harvard.iq.dataverse.DatasetFieldCompoundValue;
+import edu.harvard.iq.dataverse.DatasetFieldConstant;
+import edu.harvard.iq.dataverse.DatasetFieldType;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
+import edu.harvard.iq.dataverse.export.OAI_OREExporter;
+import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.json.JsonLDNamespace;
+import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
+import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+
+import java.io.OutputStream;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.TreeMap;
+import java.util.Map.Entry;
+
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
+
+public class OREMap {
+
+    public static final String NAME = "OREMap";
+    private Map localContext = new TreeMap();
+    private DatasetVersion version;
+    private boolean excludeEmail = false;
+    
+    public OREMap(DatasetVersion version, boolean excludeEmail) {
+        this.version = version;
+        this.excludeEmail = excludeEmail;
+    }
+
+    public void writeOREMap(OutputStream outputStream) throws Exception {
+        outputStream.write(getOREMap().toString().getBytes("UTF8"));
+        outputStream.flush();
+    }
+
+    public JsonObject getOREMap() throws Exception {
+
+        // Add namespaces we'll definitely use to Context
+        // Additional namespaces are added as needed below
+        localContext.putIfAbsent(JsonLDNamespace.ore.getPrefix(), JsonLDNamespace.ore.getUrl());
+        localContext.putIfAbsent(JsonLDNamespace.dcterms.getPrefix(), JsonLDNamespace.dcterms.getUrl());
+        localContext.putIfAbsent(JsonLDNamespace.dvcore.getPrefix(), JsonLDNamespace.dvcore.getUrl());
+        localContext.putIfAbsent(JsonLDNamespace.schema.getPrefix(), JsonLDNamespace.schema.getUrl());
+
+        Dataset dataset = version.getDataset();
+        String id = dataset.getGlobalId().asString();
+        JsonArrayBuilder fileArray = Json.createArrayBuilder();
+        //The map describes an aggregation
+        JsonObjectBuilder aggBuilder = Json.createObjectBuilder();
+        List fields = version.getDatasetFields();
+        //That has it's own metadata
+        for (DatasetField field : fields) {
+            if (!field.isEmpty()) {
+                DatasetFieldType dfType = field.getDatasetFieldType();
+                if(excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dfType.getFieldType())) {
+                    continue;
+                }
+                JsonLDTerm fieldName = getTermFor(dfType);
+                if (fieldName.inNamespace()) {
+                    localContext.putIfAbsent(fieldName.getNamespace().getPrefix(), fieldName.getNamespace().getUrl());
+                } else {
+                    localContext.putIfAbsent(fieldName.getLabel(), fieldName.getUrl());
+                }
+                JsonArrayBuilder vals = Json.createArrayBuilder();
+                if (!dfType.isCompound()) {
+                    for (String val : field.getValues_nondisplay()) {
+                        vals.add(val);
+                    }
+                } else {
+                    // ToDo: Needs to be recursive (as in JsonPrinter?)
+                    for (DatasetFieldCompoundValue dscv : field.getDatasetFieldCompoundValues()) {
+                        // compound values are of different types
+                        JsonObjectBuilder child = Json.createObjectBuilder();
+
+                        for (DatasetField dsf : dscv.getChildDatasetFields()) {
+                            DatasetFieldType dsft = dsf.getDatasetFieldType();
+                            if(excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dsft.getFieldType())) {
+                                continue;
+                            }
+                            // which may have multiple values
+                            if (!dsf.isEmpty()) {
+                                // Add context entry 
+                                //ToDo - also needs to recurse here?
+                                JsonLDTerm subFieldName = getTermFor(dfType, dsft);
+                                if (subFieldName.inNamespace()) {
+                                    localContext.putIfAbsent(subFieldName.getNamespace().getPrefix(),
+                                            subFieldName.getNamespace().getUrl());
+                                } else {
+                                    localContext.putIfAbsent(subFieldName.getLabel(), subFieldName.getUrl());
+                                }
+
+                                List values = dsf.getValues_nondisplay();
+                                if (values.size() > 1) {
+                                    JsonArrayBuilder childVals = Json.createArrayBuilder();
+
+                                    for (String val : dsf.getValues_nondisplay()) {
+                                        childVals.add(val);
+                                    }
+                                    child.add(subFieldName.getLabel(), childVals);
+                                } else {
+                                    child.add(subFieldName.getLabel(), values.get(0));
+                                }
+                            }
+                        }
+                        vals.add(child);
+                    }
+                }
+                // Add metadata value to aggregation, suppress array when only one value
+                JsonArray valArray = vals.build();
+                aggBuilder.add(fieldName.getLabel(), (valArray.size() != 1) ? valArray : valArray.get(0));
+            }
+        }
+        //Add metadata related to the Dataset/DatasetVersion
+        aggBuilder.add("@id", id)
+                .add("@type",
+                        Json.createArrayBuilder().add(JsonLDTerm.ore("Aggregation").getLabel())
+                                .add(JsonLDTerm.schemaOrg("Dataset").getLabel()))
+                .add(JsonLDTerm.schemaOrg("version").getLabel(), version.getFriendlyVersionNumber())
+                .add(JsonLDTerm.schemaOrg("datePublished").getLabel(), dataset.getPublicationDateFormattedYYYYMMDD())
+                .add(JsonLDTerm.schemaOrg("name").getLabel(), version.getTitle())
+                .add(JsonLDTerm.schemaOrg("dateModified").getLabel(), version.getLastUpdateTime().toString());
+
+        TermsOfUseAndAccess terms = version.getTermsOfUseAndAccess();
+        if (terms.getLicense() == TermsOfUseAndAccess.License.CC0) {
+            aggBuilder.add(JsonLDTerm.schemaOrg("license").getLabel(),
+                    "https://creativecommons.org/publicdomain/zero/1.0/");
+        } else {
+            addIfNotNull(aggBuilder, JsonLDTerm.termsOfUse, terms.getTermsOfUse());
+        }
+        addIfNotNull(aggBuilder, JsonLDTerm.confidentialityDeclaration, terms.getConfidentialityDeclaration());
+        addIfNotNull(aggBuilder, JsonLDTerm.specialPermissions, terms.getSpecialPermissions());
+        addIfNotNull(aggBuilder, JsonLDTerm.restrictions, terms.getRestrictions());
+        addIfNotNull(aggBuilder, JsonLDTerm.citationRequirements, terms.getCitationRequirements());
+        addIfNotNull(aggBuilder, JsonLDTerm.depositorRequirements, terms.getDepositorRequirements());
+        addIfNotNull(aggBuilder, JsonLDTerm.conditions, terms.getConditions());
+        addIfNotNull(aggBuilder, JsonLDTerm.disclaimer, terms.getDisclaimer());
+
+        //Add fileTermsofAccess as an object since it is compound
+        JsonObjectBuilder fAccess = Json.createObjectBuilder();
+        addIfNotNull(fAccess, JsonLDTerm.termsOfAccess, terms.getTermsOfAccess());
+        addIfNotNull(fAccess, JsonLDTerm.fileRequestAccess, terms.isFileAccessRequest());
+        addIfNotNull(fAccess, JsonLDTerm.dataAccessPlace, terms.getDataAccessPlace());
+        addIfNotNull(fAccess, JsonLDTerm.originalArchive, terms.getOriginalArchive());
+        addIfNotNull(fAccess, JsonLDTerm.availabilityStatus, terms.getAvailabilityStatus());
+        addIfNotNull(fAccess, JsonLDTerm.contactForAccess, terms.getContactForAccess());
+        addIfNotNull(fAccess, JsonLDTerm.sizeOfCollection, terms.getSizeOfCollection());
+        addIfNotNull(fAccess, JsonLDTerm.studyCompletion, terms.getStudyCompletion());
+        JsonObject fAccessObject = fAccess.build();
+        if (!fAccessObject.isEmpty()) {
+            aggBuilder.add(JsonLDTerm.fileTermsOfAccess.getLabel(), fAccessObject);
+        }
+
+        aggBuilder.add(JsonLDTerm.schemaOrg("includedInDataCatalog").getLabel(),
+                dataset.getDataverseContext().getDisplayName());
+
+        // The aggregation aggregates aggregatedresources (Datafiles) which each have
+        // their own entry and metadata
+        JsonArrayBuilder aggResArrayBuilder = Json.createArrayBuilder();
+
+        for (FileMetadata fmd : version.getFileMetadatas()) {
+            DataFile df = fmd.getDataFile();
+            JsonObjectBuilder aggRes = Json.createObjectBuilder();
+
+            if (fmd.getDescription() != null) {
+                aggRes.add(JsonLDTerm.schemaOrg("description").getLabel(), fmd.getDescription());
+            } else {
+                addIfNotNull(aggRes, JsonLDTerm.schemaOrg("description"), df.getDescription());
+            }
+            addIfNotNull(aggRes, JsonLDTerm.schemaOrg("name"), fmd.getLabel()); // "label" is the filename
+            addIfNotNull(aggRes, JsonLDTerm.restricted, fmd.isRestricted());
+            addIfNotNull(aggRes, JsonLDTerm.directoryLabel, fmd.getDirectoryLabel());
+            addIfNotNull(aggRes, JsonLDTerm.schemaOrg("version"), fmd.getVersion());
+            addIfNotNull(aggRes, JsonLDTerm.datasetVersionId, fmd.getDatasetVersion().getId());
+            JsonArray catArray = null;
+            if (fmd != null) {
+                List categories = fmd.getCategoriesByName();
+                if (categories.size() > 0) {
+                    JsonArrayBuilder jab = Json.createArrayBuilder();
+                    for (String s : categories) {
+                        jab.add(s);
+                    }
+                    catArray = jab.build();
+                }
+            }
+            addIfNotNull(aggRes, JsonLDTerm.categories, catArray);
+            // File DOI if it exists
+            String fileId = null;
+            String fileSameAs = null;
+            if (df.getGlobalId() != null) {
+                fileId = df.getGlobalId().asString();
+                fileSameAs = SystemConfig.getDataverseSiteUrlStatic()
+                        + "/api/access/datafile/:persistentId?persistentId=" + fileId;
+            } else {
+                fileId = SystemConfig.getDataverseSiteUrlStatic() + "/file.xhtml?fileId=" + df.getId();
+                fileSameAs = SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + df.getId();
+            }
+            aggRes.add("@id", fileId);
+            aggRes.add(JsonLDTerm.schemaOrg("sameAs").getLabel(), fileSameAs);
+            fileArray.add(fileId);
+
+            aggRes.add("@type", JsonLDTerm.ore("AggregatedResource").getLabel());
+            addIfNotNull(aggRes, JsonLDTerm.schemaOrg("fileFormat"), df.getContentType());
+            addIfNotNull(aggRes, JsonLDTerm.filesize, df.getFilesize());
+            addIfNotNull(aggRes, JsonLDTerm.storageIdentifier, df.getStorageIdentifier());
+            addIfNotNull(aggRes, JsonLDTerm.originalFileFormat, df.getOriginalFileFormat());
+            addIfNotNull(aggRes, JsonLDTerm.originalFormatLabel, df.getOriginalFormatLabel());
+            addIfNotNull(aggRes, JsonLDTerm.UNF, df.getUnf());
+            addIfNotNull(aggRes, JsonLDTerm.rootDataFileId, df.getRootDataFileId());
+            addIfNotNull(aggRes, JsonLDTerm.previousDataFileId, df.getPreviousDataFileId());
+            JsonObject checksum = null;
+            //Add checksum. RDA recommends SHA-512
+            if (df.getChecksumType() != null && df.getChecksumValue() != null) {
+                checksum = Json.createObjectBuilder().add("@type", df.getChecksumType().toString())
+                        .add("@value", df.getChecksumValue()).build();
+                aggRes.add(JsonLDTerm.checksum.getLabel(), checksum);
+            }
+            JsonArray tabTags = null;
+            JsonArrayBuilder jab = JsonPrinter.getTabularFileTags(df);
+            if (jab != null) {
+                tabTags = jab.build();
+            }
+            addIfNotNull(aggRes, JsonLDTerm.tabularTags, tabTags);
+            //Add lates resource to the array
+            aggResArrayBuilder.add(aggRes.build());
+        }
+        //Build the '@context' object for json-ld based on the localContext entries 
+        JsonObjectBuilder contextBuilder = Json.createObjectBuilder();
+        for (Entry e : localContext.entrySet()) {
+            contextBuilder.add(e.getKey(), e.getValue());
+        }
+        //Now create the overall map object with it's metadata
+        JsonObject oremap = Json.createObjectBuilder()
+                .add(JsonLDTerm.dcTerms("modified").getLabel(), LocalDate.now().toString())
+                .add(JsonLDTerm.dcTerms("creator").getLabel(),
+                        ResourceBundle.getBundle("Bundle").getString("institution.name"))
+                .add("@type", JsonLDTerm.ore("ResourceMap").getLabel())
+                // Define an id for the map itself (separate from the @id of the dataset being
+                // described
+                .add("@id",
+                        SystemConfig.getDataverseSiteUrlStatic() + "/api/datasets/export?exporter="
+                                + OAI_OREExporter.NAME + "&persistentId=" + id)
+                // Add the aggregation (Dataset) itself to the map.
+                .add(JsonLDTerm.ore("describes").getLabel(),
+                        aggBuilder.add(JsonLDTerm.ore("aggregates").getLabel(), aggResArrayBuilder.build())
+                                .add(JsonLDTerm.schemaOrg("hasPart").getLabel(), fileArray.build()).build())
+                // and finally add the context
+                .add("@context", contextBuilder.build()).build();
+        return oremap;
+    }
+
+    /*
+     * Simple methods to only add an entry to JSON if the value of the term is
+     * non-null. Methods created for string, JsonValue, boolean, and long
+     */
+    
+    private void addIfNotNull(JsonObjectBuilder builder, JsonLDTerm key, String value) {
+        if (value != null) {
+            builder.add(key.getLabel(), value);
+            addToContextMap(key);
+        }
+    }
+
+    private void addIfNotNull(JsonObjectBuilder builder, JsonLDTerm key, JsonValue value) {
+        if (value != null) {
+            builder.add(key.getLabel(), value);
+            addToContextMap(key);
+        }
+    }
+
+    private void addIfNotNull(JsonObjectBuilder builder, JsonLDTerm key, Boolean value) {
+        if (value != null) {
+            builder.add(key.getLabel(), value);
+            addToContextMap(key);
+        }
+    }
+
+    private void addIfNotNull(JsonObjectBuilder builder, JsonLDTerm key, Long value) {
+        if (value != null) {
+            builder.add(key.getLabel(), value);
+            addToContextMap(key);
+        }
+    }
+
+    private void addToContextMap(JsonLDTerm key) {
+        if (!key.inNamespace()) {
+            localContext.putIfAbsent(key.getLabel(), key.getUrl());
+        }
+    }
+
+    public JsonLDTerm getContactTerm() {
+        return getTermFor(DatasetFieldConstant.datasetContact);
+    }
+
+    public JsonLDTerm getContactNameTerm() {
+        return getTermFor(DatasetFieldConstant.datasetContact, DatasetFieldConstant.datasetContactName);
+    }
+
+    public JsonLDTerm getContactEmailTerm() {
+        return getTermFor(DatasetFieldConstant.datasetContact, DatasetFieldConstant.datasetContactEmail);
+    }
+
+    public JsonLDTerm getDescriptionTerm() {
+        return getTermFor(DatasetFieldConstant.description);
+    }
+
+    public JsonLDTerm getDescriptionTextTerm() {
+        return getTermFor(DatasetFieldConstant.description, DatasetFieldConstant.descriptionText);
+    }
+
+    private JsonLDTerm getTermFor(String fieldTypeName) {
+        for (DatasetField dsf : version.getDatasetFields()) {
+            DatasetFieldType dsft = dsf.getDatasetFieldType();
+            if (dsft.getName().equals(fieldTypeName)) {
+                return getTermFor(dsft);
+            }
+        }
+        return null;
+    }
+
+    private JsonLDTerm getTermFor(DatasetFieldType dsft) {
+        if (dsft.getUri() != null) {
+            return new JsonLDTerm(dsft.getTitle(), dsft.getUri());
+        } else {
+            String namespaceUri = dsft.getMetadataBlock().getNamespaceUri();
+            if (namespaceUri == null) {
+                namespaceUri = SystemConfig.getDataverseSiteUrlStatic() + "/schema/" + dsft.getMetadataBlock().getName()
+                        + "#";
+            }
+            JsonLDNamespace blockNamespace = new JsonLDNamespace(dsft.getMetadataBlock().getName(), namespaceUri);
+            return new JsonLDTerm(blockNamespace, dsft.getTitle());
+        }
+    }
+
+    private JsonLDTerm getTermFor(DatasetFieldType dfType, DatasetFieldType dsft) {
+        if (dsft.getUri() != null) {
+            return new JsonLDTerm(dsft.getTitle(), dsft.getUri());
+        } else {
+            // Use metadatablock URI or custom URI for this field based on the path
+            String subFieldNamespaceUri = dfType.getMetadataBlock().getNamespaceUri();
+            if (subFieldNamespaceUri == null) {
+                subFieldNamespaceUri = SystemConfig.getDataverseSiteUrlStatic() + "/schema/"
+                        + dfType.getMetadataBlock().getName() + "/";
+            }
+            subFieldNamespaceUri = subFieldNamespaceUri + dfType.getName() + "#";
+            JsonLDNamespace fieldNamespace = new JsonLDNamespace(dfType.getName(), subFieldNamespaceUri);
+            return new JsonLDTerm(fieldNamespace, dsft.getTitle());
+        }
+    }
+
+    private JsonLDTerm getTermFor(String type, String subType) {
+        for (DatasetField dsf : version.getDatasetFields()) {
+            DatasetFieldType dsft = dsf.getDatasetFieldType();
+            if (dsft.getName().equals(type)) {
+                for (DatasetFieldCompoundValue dscv : dsf.getDatasetFieldCompoundValues()) {
+                    for (DatasetField subField : dscv.getChildDatasetFields()) {
+                        DatasetFieldType subFieldType = subField.getDatasetFieldType();
+                        if (subFieldType.getName().equals(subType)) {
+                            return getTermFor(dsft, subFieldType);
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java
new file mode 100644
index 00000000000..bda4a55d623
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDNamespace.java
@@ -0,0 +1,28 @@
+package edu.harvard.iq.dataverse.util.json;
+
+public class JsonLDNamespace {
+
+	String prefix;
+
+	
+	String url;
+
+	public static JsonLDNamespace dvcore = new JsonLDNamespace("dvcore", "https://dataverse.org/schema/core#");
+	public static JsonLDNamespace dcterms = new JsonLDNamespace("dcterms","http://purl.org/dc/terms/");
+	public static JsonLDNamespace ore = new JsonLDNamespace("ore","http://www.openarchives.org/ore/terms/");
+	public static JsonLDNamespace schema = new JsonLDNamespace("schema","http://schema.org/");
+
+	public JsonLDNamespace(String prefix, String url) {
+		this.prefix = prefix;
+		this.url = url;
+	}
+
+	public String getPrefix() {
+		return prefix;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java
new file mode 100644
index 00000000000..5acb0c437ae
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonLDTerm.java
@@ -0,0 +1,102 @@
+package edu.harvard.iq.dataverse.util.json;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class JsonLDTerm {
+
+    JsonLDNamespace namespace = null;
+
+    String term = null;
+
+    String url = null;
+
+    public static JsonLDTerm termsOfUse = JsonLDTerm.DVCore("termsOfUse");
+    public static JsonLDTerm confidentialityDeclaration = JsonLDTerm.DVCore("confidentialityDeclaration");
+    public static JsonLDTerm specialPermissions = JsonLDTerm.DVCore("specialPermissions");
+    public static JsonLDTerm restrictions = JsonLDTerm.DVCore("restrictions");
+    public static JsonLDTerm citationRequirements = JsonLDTerm.DVCore("citationRequirements");
+    public static JsonLDTerm depositorRequirements = JsonLDTerm.DVCore("depositorRequirements");
+    public static JsonLDTerm conditions = JsonLDTerm.DVCore("conditions");
+    public static JsonLDTerm disclaimer = JsonLDTerm.DVCore("disclaimer");
+
+    public static JsonLDTerm fileTermsOfAccess = JsonLDTerm.DVCore("fileTermsOfAccess");
+
+    public static JsonLDTerm termsOfAccess = JsonLDTerm.DVCore("termsOfAccess");
+    public static JsonLDTerm fileRequestAccess = JsonLDTerm.DVCore("fileRequestAccess");
+    public static JsonLDTerm dataAccessPlace = JsonLDTerm.DVCore("dataAccessPlace");
+    public static JsonLDTerm originalArchive = JsonLDTerm.DVCore("originalArchive");
+    public static JsonLDTerm availabilityStatus = JsonLDTerm.DVCore("availabilityStatus");
+    public static JsonLDTerm contactForAccess = JsonLDTerm.DVCore("contactForAccess");
+    public static JsonLDTerm sizeOfCollection = JsonLDTerm.DVCore("sizeOfCollection");
+    public static JsonLDTerm studyCompletion = JsonLDTerm.DVCore("studyCompletion");
+
+    public static JsonLDTerm restricted = JsonLDTerm.DVCore("restricted");
+    public static JsonLDTerm directoryLabel = JsonLDTerm.DVCore("directoryLabel");
+    public static JsonLDTerm datasetVersionId = JsonLDTerm.DVCore("datasetVersionId");
+    public static JsonLDTerm categories = JsonLDTerm.DVCore("categories");
+    public static JsonLDTerm filesize = JsonLDTerm.DVCore("filesize");
+    public static JsonLDTerm storageIdentifier = JsonLDTerm.DVCore("storageIdentifier");
+    public static JsonLDTerm originalFileFormat = JsonLDTerm.DVCore("originalFileFormat");
+    public static JsonLDTerm originalFormatLabel = JsonLDTerm.DVCore("originalFormatLabel");
+    public static JsonLDTerm UNF = JsonLDTerm.DVCore("UNF");
+    public static JsonLDTerm rootDataFileId = JsonLDTerm.DVCore("rootDataFileId");
+    public static JsonLDTerm previousDataFileId = JsonLDTerm.DVCore("previousDataFileId");
+    public static JsonLDTerm checksum = JsonLDTerm.DVCore("checksum");
+    public static JsonLDTerm tabularTags = JsonLDTerm.DVCore("tabularTags");
+
+    public static JsonLDTerm totalSize = JsonLDTerm.DVCore("totalSize");
+    public static JsonLDTerm fileCount = JsonLDTerm.DVCore("fileCount");
+    public static JsonLDTerm maxFileSize = JsonLDTerm.DVCore("maxFileSize");
+
+    public JsonLDTerm(JsonLDNamespace namespace, String term) {
+        this.namespace = namespace;
+        this.term = term;
+    }
+
+    public JsonLDTerm(String term, String url) {
+        this.term = term;
+        this.url = url;
+    }
+
+    public static JsonLDTerm DVCore(String term) {
+        return new JsonLDTerm(JsonLDNamespace.dvcore, term);
+    }
+
+    public static JsonLDTerm ore(String term) {
+        return new JsonLDTerm(JsonLDNamespace.ore, term);
+    }
+
+    public static JsonLDTerm schemaOrg(String term) {
+        return new JsonLDTerm(JsonLDNamespace.schema, term);
+    }
+
+    public static JsonLDTerm dcTerms(String term) {
+        return new JsonLDTerm(JsonLDNamespace.dcterms, term);
+    }
+
+    public String getLabel() {
+        if (namespace == null) {
+            return term;
+        } else {
+            return namespace.getPrefix() + ":" + term;
+        }
+    }
+
+    public String getUrl() {
+        if (namespace == null) {
+            return url;
+        } else {
+            return namespace.getUrl() + term;
+        }
+    }
+
+    public boolean inNamespace() {
+        return (namespace != null);
+    }
+    
+    public JsonLDNamespace getNamespace() {
+        return namespace;
+    }
+
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
index 19d5f32d55e..bdefddf46da 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -316,6 +316,7 @@ public DatasetVersion parseDatasetVersion(JsonObject obj, DatasetVersion dsv) th
             terms.setSizeOfCollection(obj.getString("sizeOfCollection", null));
             terms.setStudyCompletion(obj.getString("studyCompletion", null));
             terms.setLicense(parseLicense(obj.getString("license", null)));
+            terms.setFileAccessRequest(obj.getBoolean("fileAccessRequest", false));
             dsv.setTermsOfUseAndAccess(terms);
             
             dsv.setDatasetFields(parseMetadataBlocks(obj.getJsonObject("metadataBlocks")));
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
index a9bc14d7ca7..91123c9d6be 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFileTag;
@@ -41,21 +40,11 @@
 import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder;
 import edu.harvard.iq.dataverse.workflow.Workflow;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Set;
+
+import java.util.*;
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
-import java.util.Date;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.EnumSet;
-import java.util.LinkedList;
-import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
@@ -76,14 +65,15 @@ public class JsonPrinter {
 
     private static final Logger logger = Logger.getLogger(JsonPrinter.class.getCanonicalName());
 
-    static SettingsServiceBean settingsService;
+    static SettingsServiceBean settingsService = null;
 
-    public JsonPrinter(SettingsServiceBean settingsService) {
-        this.settingsService = settingsService;
+    // Passed to DatasetFieldWalker so it can check the :ExcludeEmailFromExport setting
+    public static void setSettingsService(SettingsServiceBean ssb) {
+            settingsService = ssb;
     }
 
     public JsonPrinter() {
-        this(null);
+   
     }
 
     public static final BriefJsonPrinter brief = new BriefJsonPrinter();
@@ -230,7 +220,8 @@ public static JsonObjectBuilder json(Workflow wf){
             for ( WorkflowStepData stp : wf.getSteps() ) {
                 arr.add( jsonObjectBuilder().add("stepType", stp.getStepType())
                                    .add("provider", stp.getProviderId())
-                                   .add("parameters", mapToObject(stp.getStepParameters())) );
+                                   .add("parameters", mapToObject(stp.getStepParameters()))
+                                   .add("requiredSettings", mapToObject(stp.getStepParameters())) );
             }
             bld.add("steps", arr );
         }
@@ -586,6 +577,7 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
                 .add("storageIdentifier", df.getStorageIdentifier())
                 .add("originalFileFormat", df.getOriginalFileFormat())
                 .add("originalFormatLabel", df.getOriginalFormatLabel())
+                .add ("originalFileSize", df.getOriginalFileSize())
                 .add("UNF", df.getUnf())
                 //---------------------------------------------
                 // For file replace: rootDataFileId, previousDataFileId
@@ -595,7 +587,7 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
                 //---------------------------------------------
                 // Checksum
                 // * @todo Should we deprecate "md5" now that it's under
-                // * "checksum" (which may also be a SHA-1 rather than an MD5)?
+                // * "checksum" (which may also be a SHA-1 rather than an MD5)? - YES!
                 //---------------------------------------------
                 .add("md5", getMd5IfItExists(df.getChecksumType(), df.getChecksumValue()))
                 .add("checksum", getChecksumTypeAndValue(df.getChecksumType(), df.getChecksumValue()))
@@ -622,7 +614,7 @@ private static JsonArrayBuilder getFileCategories(FileMetadata fmd) {
         return fileCategories;
     }
 
-    private static JsonArrayBuilder getTabularFileTags(DataFile df) {
+    public static JsonArrayBuilder getTabularFileTags(DataFile df) {
         if (df == null) {
             return null;
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java
index db5e1824e71..6d78ab44a5f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorUtil.java
@@ -151,15 +151,15 @@ public static String getRequiredCharacters(List characterRules, i
         String returnString = "";
         
         if(lowercase <= 1 && uppercase <= 1 && digit <= 1 && alphabetical <= 1 && special <= 1) {
-            returnString = ((uppercase == 1) ? "uppercase" : "") 
-                    + ((lowercase == 1) ? ", lowercase" : "") 
-                    + ((alphabetical == 1 ) ? ", letter" : "") 
-                    + ((digit == 1) ? ", numeral" : "") 
-                    + ((special == 1) ? ", special" : "");
+            returnString = ((uppercase == 1) ? BundleUtil.getStringFromBundle("passwdVal.passwdReq.uppercase") : "")
+                    + ((lowercase == 1) ? ", "+BundleUtil.getStringFromBundle("passwdVal.passwdReq.lowercase") : "")
+                    + ((alphabetical == 1 ) ? ", "+BundleUtil.getStringFromBundle("passwdVal.passwdReq.letter") : "")
+                    + ((digit == 1) ? ", "+BundleUtil.getStringFromBundle("passwdVal.passwdReq.numeral") : "")
+                    + ((special == 1) ? ", "+BundleUtil.getStringFromBundle("passwdVal.passwdReq.special") : "");
             
 
             
-            String eachOrSomeCharacteristics = ((characterRules.size()) > numberOfCharacteristics ) ? Integer.toString(numberOfCharacteristics) : "each";
+            String eachOrSomeCharacteristics = ((characterRules.size()) > numberOfCharacteristics ) ? Integer.toString(numberOfCharacteristics) : BundleUtil.getStringFromBundle("passwdVal.passwdReq.each");
             return BundleUtil.getStringFromBundle("passwdVal.passwdReq.characteristicsReq" , Arrays.asList(eachOrSomeCharacteristics)) 
                     + " " + StringUtils.strip(returnString, " ,");
         } else {
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java b/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java
index b2f4171a190..fed77988db3 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/PendingWorkflowInvocation.java
@@ -47,10 +47,10 @@ public class PendingWorkflowInvocation implements Serializable {
     
     int pendingStepIdx;
     
-    String doiProvider;
     String userId;
     String ipAddress;
     int typeOrdinal;
+    boolean datasetExternallyReleased;
 
     /** Empty constructor for JPA */
     public PendingWorkflowInvocation(){
@@ -66,15 +66,14 @@ public PendingWorkflowInvocation(Workflow wf, WorkflowContext ctxt, Pending resu
         userId = ctxt.getRequest().getUser().getIdentifier();
         ipAddress = ctxt.getRequest().getSourceAddress().toString();
         localData = new HashMap<>(result.getData());
-        doiProvider = ctxt.getDoiProvider();
         typeOrdinal = ctxt.getType().ordinal();
+        datasetExternallyReleased=ctxt.getDatasetExternallyReleased();
     }
     
     public WorkflowContext reCreateContext(RoleAssigneeServiceBean roleAssignees) {
         DataverseRequest aRequest = new DataverseRequest((User)roleAssignees.getRoleAssignee(userId), IpAddress.valueOf(ipAddress));
         final WorkflowContext workflowContext = new WorkflowContext(aRequest, dataset, nextVersionNumber, 
-                nextMinorVersionNumber, WorkflowContext.TriggerType.values()[typeOrdinal], 
-                doiProvider);
+                nextMinorVersionNumber, WorkflowContext.TriggerType.values()[typeOrdinal], null, null, datasetExternallyReleased);
         workflowContext.setInvocationId(invocationId);
         return workflowContext;
     }
@@ -151,14 +150,6 @@ public void setPendingStepIdx(int pendingStepIdx) {
         this.pendingStepIdx = pendingStepIdx;
     }
 
-    public String getDoiProvider() {
-        return doiProvider;
-    }
-
-    public void setDoiProvider(String doiProvider) {
-        this.doiProvider = doiProvider;
-    }
-
     public int getTypeOrdinal() {
         return typeOrdinal;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java b/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java
index c72d5a67724..6c73ed0e64b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/Workflow.java
@@ -2,7 +2,9 @@
 
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -63,6 +65,14 @@ public void setSteps(List steps) {
         }
     }
 
+    Map getRequiredSettings() {
+        Map settings = new HashMap();
+        for(WorkflowStepData step: steps) {
+            settings.putAll(step.getStepSettings());
+        }
+        return settings;
+    }
+
     @Override
     public int hashCode() {
         int hash = 7;
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java
index 0cca2bd64a9..6ea87a27013 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowContext.java
@@ -1,8 +1,11 @@
 package edu.harvard.iq.dataverse.workflow;
 
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
+
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -25,26 +28,29 @@ public enum TriggerType {
     private final long    nextVersionNumber;
     private final long    nextMinorVersionNumber;
     private final TriggerType    type;
-    private final String  doiProvider;
+    private final ApiToken apiToken;
+    private final boolean datasetExternallyReleased;
+    private Map settings;
     
     private String invocationId = UUID.randomUUID().toString();
 
-    public WorkflowContext( DataverseRequest aRequest, Dataset aDataset, String doiProvider, TriggerType aTriggerType ) {
+    public WorkflowContext( DataverseRequest aRequest, Dataset aDataset, TriggerType aTriggerType, boolean datasetExternallyReleased ) {
         this( aRequest, aDataset,
                 aDataset.getLatestVersion().getVersionNumber(), 
                 aDataset.getLatestVersion().getMinorVersionNumber(),
-                aTriggerType, 
-                doiProvider);
+                aTriggerType, null, null, datasetExternallyReleased);
     }
     
     public WorkflowContext(DataverseRequest request, Dataset dataset, long nextVersionNumber, 
-                            long nextMinorVersionNumber, TriggerType type, String doiProvider) {
+                            long nextMinorVersionNumber, TriggerType type, Map settings, ApiToken apiToken, boolean datasetExternallyReleased) {
         this.request = request;
         this.dataset = dataset;
         this.nextVersionNumber = nextVersionNumber;
         this.nextMinorVersionNumber = nextMinorVersionNumber;
         this.type = type;
-        this.doiProvider = doiProvider;
+        this.settings = settings;
+        this.apiToken = apiToken;
+        this.datasetExternallyReleased = datasetExternallyReleased;
     }
 
     public Dataset getDataset() {
@@ -75,12 +81,20 @@ public String getInvocationId() {
         return invocationId;
     }
 
-    public String getDoiProvider() {
-        return doiProvider;
-    }
-
     public TriggerType getType() {
         return type;
     }
+
+    public Map getSettings() {
+        return settings;
+    }
+
+    public ApiToken getApiToken() {
+        return apiToken;
+    }
+
+    public boolean getDatasetExternallyReleased() {
+       return datasetExternallyReleased;
+    }
     
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java
index 4fc7eb63bd1..725aa28d09b 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java
@@ -2,8 +2,12 @@
 
 import edu.harvard.iq.dataverse.DatasetLock;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
+import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
 import edu.harvard.iq.dataverse.EjbDataverseEngine;
 import edu.harvard.iq.dataverse.RoleAssigneeServiceBean;
+import edu.harvard.iq.dataverse.authorization.users.ApiToken;
+import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.FinalizeDatasetPublicationCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RemoveLockCommand;
@@ -15,6 +19,8 @@
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStep;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepData;
 import edu.harvard.iq.dataverse.workflow.step.WorkflowStepResult;
+
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,9 +32,11 @@
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 
 /**
  * Service bean for managing and executing {@link Workflow}s
@@ -56,6 +64,9 @@ public class WorkflowServiceBean {
     @EJB
     EjbDataverseEngine engine;
     
+    @Inject
+    DataverseRequestServiceBean dvRequestService;
+    
     final Map providers = new HashMap<>();
 
     public WorkflowServiceBean() {
@@ -86,13 +97,46 @@ public WorkflowServiceBean() {
      */
     @Asynchronous
     public void start(Workflow wf, WorkflowContext ctxt) throws CommandException {
-        ctxt = refresh(ctxt);
+        ctxt = refresh(ctxt, retrieveRequestedSettings( wf.getRequiredSettings()), getCurrentApiToken(ctxt.getRequest().getAuthenticatedUser()));
         lockDataset(ctxt);
         forward(wf, ctxt);
     }
     
 
+    private ApiToken getCurrentApiToken(AuthenticatedUser au) {
+        if (au != null) {
+            CommandContext ctxt = engine.getContext();
+            ApiToken token = ctxt.authentication().findApiTokenByUser(au);
+            if ((token == null) || (token.getExpireTime().before(new Date()))) {
+                token = ctxt.authentication().generateApiTokenForUser(au);
+            }
+            return token;
+        }
+        return null;
+    }
 
+    private Map retrieveRequestedSettings(Map requiredSettings) {
+        Map retrievedSettings = new HashMap();
+        for (String setting : requiredSettings.keySet()) {
+            String settingType = requiredSettings.get(setting);
+            switch (settingType) {
+            case "string": {
+                retrievedSettings.put(setting, settings.get(setting));
+                break;
+            }
+            case "boolean": {
+                retrievedSettings.put(setting, settings.isTrue(settingType, false));
+                break;
+            }
+            case "long": {
+                retrievedSettings.put(setting,
+                        settings.getValueForKeyAsLong(SettingsServiceBean.Key.valueOf(setting)));
+                break;
+            }
+            }
+        }
+        return retrievedSettings;
+    }
 
     /**
      * Starting the resume process for a pending workflow. We first delete the
@@ -122,8 +166,8 @@ private void doResume(PendingWorkflowInvocation pending, String body) {
         List stepsLeft = wf.getSteps().subList(pending.getPendingStepIdx(), wf.getSteps().size());
         
         WorkflowStep pendingStep = createStep(stepsLeft.get(0));
-        final WorkflowContext ctxt = pending.reCreateContext(roleAssignees);
-
+        WorkflowContext newCtxt = pending.reCreateContext(roleAssignees);
+        final WorkflowContext ctxt = refresh(newCtxt,retrieveRequestedSettings( wf.getRequiredSettings()), getCurrentApiToken(newCtxt.getRequest().getAuthenticatedUser()));
         WorkflowStepResult res = pendingStep.resume(ctxt, pending.getLocalData(), body);
         if (res instanceof Failure) {
             rollback(wf, ctxt, (Failure) res, pending.getPendingStepIdx() - 1);
@@ -156,14 +200,7 @@ private void rollback(Workflow wf, WorkflowContext ctxt, Failure failure, int la
         
         logger.log( Level.INFO, "Removing workflow lock");
         try {
-            engine.submit( new RemoveLockCommand(ctxt.getRequest(), ctxt.getDataset(), DatasetLock.Reason.Workflow) );
-            
-            // Corner case - delete locks generated within this same transaction.
-            Query deleteQuery = em.createQuery("DELETE from DatasetLock l WHERE l.dataset.id=:id AND l.reason=:reason");
-            deleteQuery.setParameter("id", ctxt.getDataset().getId() );
-            deleteQuery.setParameter("reason", DatasetLock.Reason.Workflow );
-            deleteQuery.executeUpdate();
-            
+            unlockDataset(ctxt);
         } catch (CommandException ex) {
             logger.log(Level.SEVERE, "Error restoring dataset locks state after rollback: " + ex.getMessage(), ex);
         }
@@ -186,7 +223,8 @@ private void executeSteps(Workflow wf, WorkflowContext ctxt, int initialStepIdx
             try {
                 if (res == WorkflowStepResult.OK) {
                     logger.log(Level.INFO, "Workflow {0} step {1}: OK", new Object[]{ctxt.getInvocationId(), stepIdx});
-
+                    em.merge(ctxt.getDataset());
+                    ctxt = refresh(ctxt);
                 } else if (res instanceof Failure) {
                     logger.log(Level.WARNING, "Workflow {0} failed: {1}", new Object[]{ctxt.getInvocationId(), ((Failure) res).getReason()});
                     rollback(wf, ctxt, (Failure) res, stepIdx-1 );
@@ -231,12 +269,36 @@ void rollbackStep( WorkflowStep step, WorkflowContext ctxt, Failure reason ) {
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     void lockDataset( WorkflowContext ctxt ) throws CommandException {
         final DatasetLock datasetLock = new DatasetLock(DatasetLock.Reason.Workflow, ctxt.getRequest().getAuthenticatedUser());
-//        engine.submit(new AddLockCommand(ctxt.getRequest(), ctxt.getDataset(), datasetLock));
+        /* Note that this method directly adds a lock to the database rather than adding it via 
+         * engine.submit(new AddLockCommand(ctxt.getRequest(), ctxt.getDataset(), datasetLock));
+         * which would update the dataset's list of locks, etc. 
+         * An em.find() for the dataset would get a Dataset that has an updated list of locks, but this copy would not have any changes
+         * made in a calling command (e.g. for a PostPublication workflow, the fact that the latest version is 'released' is not yet in the 
+         * database. 
+         */
         datasetLock.setDataset(ctxt.getDataset());
         em.persist(datasetLock);
         em.flush();
     }
     
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    void unlockDataset( WorkflowContext ctxt ) throws CommandException {
+    	/* Since the lockDataset command above directly persists a lock to the database, 
+    	 * the ctxt.getDataset() is not updated and its list of locks can't be used. Using the named query below will find the workflow
+    	 * lock and remove it (actually all workflow locks for this Dataset but only one workflow should be active). 
+    	 */
+        TypedQuery lockCounter = em.createNamedQuery("DatasetLock.getLocksByDatasetId", DatasetLock.class);
+        lockCounter.setParameter("datasetId", ctxt.getDataset().getId());
+        List locks = lockCounter.getResultList();
+        for(DatasetLock lock: locks) {
+        	if(lock.getReason() == DatasetLock.Reason.Workflow) {
+                logger.fine("Removing lock");
+        		em.remove(lock);
+        	}
+        }
+        em.flush();
+    }
+    
     //
     //
     //////////////////////////////////////////////////////////////
@@ -249,15 +311,20 @@ private void pauseAndAwait(Workflow wf, WorkflowContext ctxt, Pending pendingRes
 
     private void workflowCompleted(Workflow wf, WorkflowContext ctxt) {
         logger.log(Level.INFO, "Workflow {0} completed.", ctxt.getInvocationId());
-        if ( ctxt.getType() == TriggerType.PrePublishDataset ) {
+        
             try {
-                engine.submit( new FinalizeDatasetPublicationCommand(ctxt.getDataset(), ctxt.getDoiProvider(), ctxt.getRequest()) );
-                                
+        if ( ctxt.getType() == TriggerType.PrePublishDataset ) {
+                unlockDataset(ctxt);
+                engine.submit(new FinalizeDatasetPublicationCommand(ctxt.getDataset(), ctxt.getRequest(), ctxt.getDatasetExternallyReleased()));
+            } else {
+                logger.fine("Removing workflow lock");
+                unlockDataset(ctxt);
+            }
             } catch (CommandException ex) {
                 logger.log(Level.SEVERE, "Exception finalizing workflow " + ctxt.getInvocationId() +": " + ex.getMessage(), ex);
                 rollback(wf, ctxt, new Failure("Exception while finalizing the publication: " + ex.getMessage()), wf.steps.size()-1);
             }
-        }
+        
     }
 
     public List listWorkflows() {
@@ -350,9 +417,20 @@ private WorkflowStep createStep(WorkflowStepData wsd) {
     }
     
     private WorkflowContext refresh( WorkflowContext ctxt ) {
+    	return refresh(ctxt, ctxt.getSettings(), ctxt.getApiToken());
+    }
+    
+    private WorkflowContext refresh( WorkflowContext ctxt, Map settings, ApiToken apiToken ) {
+    	/* An earlier version of this class used em.find() to 'refresh' the Dataset in the context. 
+    	 * For a PostPublication workflow, this had the consequence of hiding/removing changes to the Dataset 
+    	 * made in the FinalizeDatasetPublicationCommand (i.e. the fact that the draft version is now released and
+    	 * has a version number). It is not clear to me if the em.merge below is needed or if it handles the case of 
+    	 * resumed workflows. (The overall method is needed to allow the context to be updated in the start() method with the
+    	 * settings and APItoken retrieved by the WorkflowServiceBean) - JM - 9/18.
+    	 */
         return new WorkflowContext( ctxt.getRequest(), 
-                       datasets.find( ctxt.getDataset().getId() ), ctxt.getNextVersionNumber(), 
-                       ctxt.getNextMinorVersionNumber(), ctxt.getType(), ctxt.getDoiProvider() );
+                       em.merge(ctxt.getDataset()), ctxt.getNextVersionNumber(), 
+                       ctxt.getNextMinorVersionNumber(), ctxt.getType(), settings, apiToken, ctxt.getDatasetExternallyReleased());
     }
 
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java b/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java
index 1e10d0ecb7b..a06531a2666 100644
--- a/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java
+++ b/src/main/java/edu/harvard/iq/dataverse/workflow/step/WorkflowStepData.java
@@ -38,6 +38,11 @@ public class WorkflowStepData implements Serializable {
     @Column(length = 2048)
     private Map stepParameters;
 
+    @ElementCollection( fetch=FetchType.EAGER )
+    @Column(length = 2048)
+    private Map stepSettings;
+
+
     public Workflow getParent() {
         return parent;
     }
@@ -80,7 +85,15 @@ public void setId(long id) {
 
     @Override
     public String toString() {
-        return "WorkflowStepData{" + "parent=" + parent + ", providerId=" + providerId + ", stepType=" + stepType + ", parameters=" + stepParameters + '}';
+        return "WorkflowStepData{" + "parent=" + parent + ", providerId=" + providerId + ", stepType=" + stepType + ", parameters=" + stepParameters + ", settings=" + stepSettings + '}';
+    }
+
+    public void setStepSettings(Map settingsMap) {
+        this.stepSettings=settingsMap;
+    }
+
+    public Map getStepSettings() {
+        return stepSettings;
     }
     
     
diff --git a/src/main/java/geospatial.properties b/src/main/java/geospatial.properties
new file mode 100644
index 00000000000..e47982377cb
--- /dev/null
+++ b/src/main/java/geospatial.properties
@@ -0,0 +1,284 @@
+metadatablock.name=geospatial
+metadatablock.displayName=Geospatial Metadata
+datasetfieldtype.geographicCoverage.title=Geographic Coverage
+datasetfieldtype.country.title=Country / Nation
+datasetfieldtype.state.title=State / Province
+datasetfieldtype.city.title=City
+datasetfieldtype.otherGeographicCoverage.title=Other
+datasetfieldtype.geographicUnit.title=Geographic Unit
+datasetfieldtype.geographicBoundingBox.title=Geographic Bounding Box
+datasetfieldtype.westLongitude.title=West Longitude
+datasetfieldtype.eastLongitude.title=East Longitude
+datasetfieldtype.northLongitude.title=North Latitude
+datasetfieldtype.southLongitude.title=South Latitude
+datasetfieldtype.geographicCoverage.description=Information on the geographic coverage of the data. Includes the total geographic scope of the data.
+datasetfieldtype.country.description=The country or nation that the Dataset is about.
+datasetfieldtype.state.description=The state or province that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.
+datasetfieldtype.city.description=The name of the city that the Dataset is about. Use GeoNames for correct spelling and avoid abbreviations.
+datasetfieldtype.otherGeographicCoverage.description=Other information on the geographic coverage of the data.
+datasetfieldtype.geographicUnit.description=Lowest level of geographic aggregation covered by the Dataset, e.g., village, county, region.
+datasetfieldtype.geographicBoundingBox.description=The fundamental geometric description for any Dataset that models geography is the geographic bounding box. It describes the minimum box, defined by west and east longitudes and north and south latitudes, which includes the largest geographic extent of the  Dataset's geographic coverage. This element is used in the first pass of a coordinate-based search. Inclusion of this element in the codebook is recommended, but is required if the bound polygon box is included.
+datasetfieldtype.westLongitude.description=Westernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180,0 <= West  Bounding Longitude Value <= 180,0.
+datasetfieldtype.eastLongitude.description=Easternmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -180,0 <= East Bounding Longitude Value <= 180,0.
+datasetfieldtype.northLongitude.description=Northernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90,0 <= North Bounding Latitude Value <= 90,0.
+datasetfieldtype.southLongitude.description=Southernmost coordinate delimiting the geographic extent of the Dataset. A valid range of values,  expressed in decimal degrees, is -90,0 <= South Bounding Latitude Value <= 90,0.
+datasetfieldtype.geographicCoverage.watermark=
+datasetfieldtype.country.watermark=
+datasetfieldtype.state.watermark=
+datasetfieldtype.city.watermark=
+datasetfieldtype.otherGeographicCoverage.watermark=
+datasetfieldtype.geographicUnit.watermark=
+datasetfieldtype.geographicBoundingBox.watermark=
+datasetfieldtype.westLongitude.watermark=
+datasetfieldtype.eastLongitude.watermark=
+datasetfieldtype.northLongitude.watermark=
+datasetfieldtype.southLongitude.watermark=
+controlledvocabulary.country.afghanistan=Afghanistan
+controlledvocabulary.country.albania=Albania
+controlledvocabulary.country.algeria=Algeria
+controlledvocabulary.country.american_samoa=American Samoa
+controlledvocabulary.country.andorra=Andorra
+controlledvocabulary.country.angola=Angola
+controlledvocabulary.country.anguilla=Anguilla
+controlledvocabulary.country.antarctica=Antarctica
+controlledvocabulary.country.antigua_and_barbuda=Antigua and Barbuda
+controlledvocabulary.country.argentina=Argentina
+controlledvocabulary.country.armenia=Armenia
+controlledvocabulary.country.aruba=Aruba
+controlledvocabulary.country.australia=Australia
+controlledvocabulary.country.austria=Austria
+controlledvocabulary.country.azerbaijan=Azerbaijan
+controlledvocabulary.country.bahamas=Bahamas
+controlledvocabulary.country.bahrain=Bahrain
+controlledvocabulary.country.bangladesh=Bangladesh
+controlledvocabulary.country.barbados=Barbados
+controlledvocabulary.country.belarus=Belarus
+controlledvocabulary.country.belgium=Belgium
+controlledvocabulary.country.belize=Belize
+controlledvocabulary.country.benin=Benin
+controlledvocabulary.country.bermuda=Bermuda
+controlledvocabulary.country.bhutan=Bhutan
+controlledvocabulary.country.bolivia,_plurinational_state_of=Bolivia, Plurinational State of
+controlledvocabulary.country.bonaire,_sint_eustatius_and_saba=Bonaire, Sint Eustatius and Saba
+controlledvocabulary.country.bosnia_and_herzegovina=Bosnia and Herzegovina
+controlledvocabulary.country.botswana=Botswana
+controlledvocabulary.country.bouvet_island=Bouvet Island
+controlledvocabulary.country.brazil=Brazil
+controlledvocabulary.country.british_indian_ocean_territory=British Indian Ocean Territory
+controlledvocabulary.country.brunei_darussalam=Brunei Darussalam
+controlledvocabulary.country.bulgaria=Bulgaria
+controlledvocabulary.country.burkina_faso=Burkina Faso
+controlledvocabulary.country.burundi=Burundi
+controlledvocabulary.country.cambodia=Cambodia
+controlledvocabulary.country.cameroon=Cameroon
+controlledvocabulary.country.canada=Canada
+controlledvocabulary.country.cape_verde=Cape Verde
+controlledvocabulary.country.cayman_islands=Cayman Islands
+controlledvocabulary.country.central_african_republic=Central African Republic
+controlledvocabulary.country.chad=Chad
+controlledvocabulary.country.chile=Chile
+controlledvocabulary.country.china=China
+controlledvocabulary.country.christmas_island=Christmas Island
+controlledvocabulary.country.cocos_(keeling)_islands=Cocos (Keeling) Islands
+controlledvocabulary.country.colombia=Colombia
+controlledvocabulary.country.comoros=Comoros
+controlledvocabulary.country.congo=Congo
+controlledvocabulary.country.congo,_the_democratic_republic_of_the=Congo, the Democratic Republic of the
+controlledvocabulary.country.cook_islands=Cook Islands
+controlledvocabulary.country.costa_rica=Costa Rica
+controlledvocabulary.country.croatia=Croatia
+controlledvocabulary.country.cuba=Cuba
+controlledvocabulary.country.curacao=Curaao
+controlledvocabulary.country.cyprus=Cyprus
+controlledvocabulary.country.czech_republic=Czech Republic
+controlledvocabulary.country.cote_d'ivoire=Cte d'Ivoire
+controlledvocabulary.country.denmark=Denmark
+controlledvocabulary.country.djibouti=Djibouti
+controlledvocabulary.country.dominica=Dominica
+controlledvocabulary.country.dominican_republic=Dominican Republic
+controlledvocabulary.country.ecuador=Ecuador
+controlledvocabulary.country.egypt=Egypt
+controlledvocabulary.country.el_salvador=El Salvador
+controlledvocabulary.country.equatorial_guinea=Equatorial Guinea
+controlledvocabulary.country.eritrea=Eritrea
+controlledvocabulary.country.estonia=Estonia
+controlledvocabulary.country.ethiopia=Ethiopia
+controlledvocabulary.country.falkland_islands_(malvinas)=Falkland Islands (Malvinas)
+controlledvocabulary.country.faroe_islands=Faroe Islands
+controlledvocabulary.country.fiji=Fiji
+controlledvocabulary.country.finland=Finland
+controlledvocabulary.country.france=France
+controlledvocabulary.country.french_guiana=French Guiana
+controlledvocabulary.country.french_polynesia=French Polynesia
+controlledvocabulary.country.french_southern_territories=French Southern Territories
+controlledvocabulary.country.gabon=Gabon
+controlledvocabulary.country.gambia=Gambia
+controlledvocabulary.country.georgia=Georgia
+controlledvocabulary.country.germany=Germany
+controlledvocabulary.country.ghana=Ghana
+controlledvocabulary.country.gibraltar=Gibraltar
+controlledvocabulary.country.greece=Greece
+controlledvocabulary.country.greenland=Greenland
+controlledvocabulary.country.grenada=Grenada
+controlledvocabulary.country.guadeloupe=Guadeloupe
+controlledvocabulary.country.guam=Guam
+controlledvocabulary.country.guatemala=Guatemala
+controlledvocabulary.country.guernsey=Guernsey
+controlledvocabulary.country.guinea=Guinea
+controlledvocabulary.country.guinea-bissau=Guinea-Bissau
+controlledvocabulary.country.guyana=Guyana
+controlledvocabulary.country.haiti=Haiti
+controlledvocabulary.country.heard_island_and_mcdonald_islands=Heard Island and Mcdonald Islands
+controlledvocabulary.country.holy_see_(vatican_city_state)=Holy See (Vatican City State)
+controlledvocabulary.country.honduras=Honduras
+controlledvocabulary.country.hong_kong=Hong Kong
+controlledvocabulary.country.hungary=Hungary
+controlledvocabulary.country.iceland=Iceland
+controlledvocabulary.country.india=India
+controlledvocabulary.country.indonesia=Indonesia
+controlledvocabulary.country.iran,_islamic_republic_of=Iran, Islamic Republic of
+controlledvocabulary.country.iraq=Iraq
+controlledvocabulary.country.ireland=Ireland
+controlledvocabulary.country.isle_of_man=Isle of Man
+controlledvocabulary.country.israel=Israel
+controlledvocabulary.country.italy=Italy
+controlledvocabulary.country.jamaica=Jamaica
+controlledvocabulary.country.japan=Japan
+controlledvocabulary.country.jersey=Jersey
+controlledvocabulary.country.jordan=Jordan
+controlledvocabulary.country.kazakhstan=Kazakhstan
+controlledvocabulary.country.kenya=Kenya
+controlledvocabulary.country.kiribati=Kiribati
+controlledvocabulary.country.korea,_democratic_people's_republic_of=Korea, Democratic People's Republic of
+controlledvocabulary.country.korea,_republic_of=Korea, Republic of
+controlledvocabulary.country.kuwait=Kuwait
+controlledvocabulary.country.kyrgyzstan=Kyrgyzstan
+controlledvocabulary.country.lao_people's_democratic_republic=Lao People's Democratic Republic
+controlledvocabulary.country.latvia=Latvia
+controlledvocabulary.country.lebanon=Lebanon
+controlledvocabulary.country.lesotho=Lesotho
+controlledvocabulary.country.liberia=Liberia
+controlledvocabulary.country.libya=Libya
+controlledvocabulary.country.liechtenstein=Liechtenstein
+controlledvocabulary.country.lithuania=Lithuania
+controlledvocabulary.country.luxembourg=Luxembourg
+controlledvocabulary.country.macao=Macao
+controlledvocabulary.country.macedonia,_the_former_yugoslav_republic_of=Macedonia, the Former Yugoslav Republic of
+controlledvocabulary.country.madagascar=Madagascar
+controlledvocabulary.country.malawi=Malawi
+controlledvocabulary.country.malaysia=Malaysia
+controlledvocabulary.country.maldives=Maldives
+controlledvocabulary.country.mali=Mali
+controlledvocabulary.country.malta=Malta
+controlledvocabulary.country.marshall_islands=Marshall Islands
+controlledvocabulary.country.martinique=Martinique
+controlledvocabulary.country.mauritania=Mauritania
+controlledvocabulary.country.mauritius=Mauritius
+controlledvocabulary.country.mayotte=Mayotte
+controlledvocabulary.country.mexico=Mexico
+controlledvocabulary.country.micronesia,_federated_states_of=Micronesia, Federated States of
+controlledvocabulary.country.moldova,_republic_of=Moldova, Republic of
+controlledvocabulary.country.monaco=Monaco
+controlledvocabulary.country.mongolia=Mongolia
+controlledvocabulary.country.montenegro=Montenegro
+controlledvocabulary.country.montserrat=Montserrat
+controlledvocabulary.country.morocco=Morocco
+controlledvocabulary.country.mozambique=Mozambique
+controlledvocabulary.country.myanmar=Myanmar
+controlledvocabulary.country.namibia=Namibia
+controlledvocabulary.country.nauru=Nauru
+controlledvocabulary.country.nepal=Nepal
+controlledvocabulary.country.netherlands=Netherlands
+controlledvocabulary.country.new_caledonia=New Caledonia
+controlledvocabulary.country.new_zealand=New Zealand
+controlledvocabulary.country.nicaragua=Nicaragua
+controlledvocabulary.country.niger=Niger
+controlledvocabulary.country.nigeria=Nigeria
+controlledvocabulary.country.niue=Niue
+controlledvocabulary.country.norfolk_island=Norfolk Island
+controlledvocabulary.country.northern_mariana_islands=Northern Mariana Islands
+controlledvocabulary.country.norway=Norway
+controlledvocabulary.country.oman=Oman
+controlledvocabulary.country.pakistan=Pakistan
+controlledvocabulary.country.palau=Palau
+controlledvocabulary.country.palestine,_state_of=Palestine, State of
+controlledvocabulary.country.panama=Panama
+controlledvocabulary.country.papua_new_guinea=Papua New Guinea
+controlledvocabulary.country.paraguay=Paraguay
+controlledvocabulary.country.peru=Peru
+controlledvocabulary.country.philippines=Philippines
+controlledvocabulary.country.pitcairn=Pitcairn
+controlledvocabulary.country.poland=Poland
+controlledvocabulary.country.portugal=Portugal
+controlledvocabulary.country.puerto_rico=Puerto Rico
+controlledvocabulary.country.qatar=Qatar
+controlledvocabulary.country.romania=Romania
+controlledvocabulary.country.russian_federation=Russian Federation
+controlledvocabulary.country.rwanda=Rwanda
+controlledvocabulary.country.reunion=Runion
+controlledvocabulary.country.saint_barthelemy=Saint Barthlemy
+controlledvocabulary.country.saint_helena,_ascension_and_tristan_da_cunha=Saint Helena, Ascension and Tristan da Cunha
+controlledvocabulary.country.saint_kitts_and_nevis=Saint Kitts and Nevis
+controlledvocabulary.country.saint_lucia=Saint Lucia
+controlledvocabulary.country.saint_martin_(french_part)=Saint Martin (French part)
+controlledvocabulary.country.saint_pierre_and_miquelon=Saint Pierre and Miquelon
+controlledvocabulary.country.saint_vincent_and_the_grenadines=Saint Vincent and the Grenadines
+controlledvocabulary.country.samoa=Samoa
+controlledvocabulary.country.san_marino=San Marino
+controlledvocabulary.country.sao_tome_and_principe=Sao Tome and Principe
+controlledvocabulary.country.saudi_arabia=Saudi Arabia
+controlledvocabulary.country.senegal=Senegal
+controlledvocabulary.country.serbia=Serbia
+controlledvocabulary.country.seychelles=Seychelles
+controlledvocabulary.country.sierra_leone=Sierra Leone
+controlledvocabulary.country.singapore=Singapore
+controlledvocabulary.country.sint_maarten_(dutch_part)=Sint Maarten (Dutch part)
+controlledvocabulary.country.slovakia=Slovakia
+controlledvocabulary.country.slovenia=Slovenia
+controlledvocabulary.country.solomon_islands=Solomon Islands
+controlledvocabulary.country.somalia=Somalia
+controlledvocabulary.country.south_africa=South Africa
+controlledvocabulary.country.south_georgia_and_the_south_sandwich_islands=South Georgia and the South Sandwich Islands
+controlledvocabulary.country.south_sudan=South Sudan
+controlledvocabulary.country.spain=Spain
+controlledvocabulary.country.sri_lanka=Sri Lanka
+controlledvocabulary.country.sudan=Sudan
+controlledvocabulary.country.suriname=Suriname
+controlledvocabulary.country.svalbard_and_jan_mayen=Svalbard and Jan Mayen
+controlledvocabulary.country.swaziland=Swaziland
+controlledvocabulary.country.sweden=Sweden
+controlledvocabulary.country.switzerland=Switzerland
+controlledvocabulary.country.syrian_arab_republic=Syrian Arab Republic
+controlledvocabulary.country.taiwan,_province_of_china=Taiwan, Province of China
+controlledvocabulary.country.tajikistan=Tajikistan
+controlledvocabulary.country.tanzania,_united_republic_of=Tanzania, United Republic of
+controlledvocabulary.country.thailand=Thailand
+controlledvocabulary.country.timor-leste=Timor-Leste
+controlledvocabulary.country.togo=Togo
+controlledvocabulary.country.tokelau=Tokelau
+controlledvocabulary.country.tonga=Tonga
+controlledvocabulary.country.trinidad_and_tobago=Trinidad and Tobago
+controlledvocabulary.country.tunisia=Tunisia
+controlledvocabulary.country.turkey=Turkey
+controlledvocabulary.country.turkmenistan=Turkmenistan
+controlledvocabulary.country.turks_and_caicos_islands=Turks and Caicos Islands
+controlledvocabulary.country.tuvalu=Tuvalu
+controlledvocabulary.country.uganda=Uganda
+controlledvocabulary.country.ukraine=Ukraine
+controlledvocabulary.country.united_arab_emirates=United Arab Emirates
+controlledvocabulary.country.united_kingdom=United Kingdom
+controlledvocabulary.country.united_states=United States
+controlledvocabulary.country.united_states_minor_outlying_islands=United States Minor Outlying Islands
+controlledvocabulary.country.uruguay=Uruguay
+controlledvocabulary.country.uzbekistan=Uzbekistan
+controlledvocabulary.country.vanuatu=Vanuatu
+controlledvocabulary.country.venezuela,_bolivarian_republic_of=Venezuela, Bolivarian Republic of
+controlledvocabulary.country.viet_nam=Viet Nam
+controlledvocabulary.country.virgin_islands,_british=Virgin Islands, British
+controlledvocabulary.country.virgin_islands,_u.s.=Virgin Islands, U.S.
+controlledvocabulary.country.wallis_and_futuna=Wallis and Futuna
+controlledvocabulary.country.western_sahara=Western Sahara
+controlledvocabulary.country.yemen=Yemen
+controlledvocabulary.country.zambia=Zambia
+controlledvocabulary.country.zimbabwe=Zimbabwe
+controlledvocabulary.country.aland_islands=land Islands
\ No newline at end of file
diff --git a/src/main/java/geospatial_fr.properties b/src/main/java/geospatial_fr.properties
new file mode 100644
index 00000000000..f900bc4d5a7
--- /dev/null
+++ b/src/main/java/geospatial_fr.properties
@@ -0,0 +1,284 @@
+metadatablock.name=geospatial
+metadatablock.displayName=Mtadonnes gospatiales
+datasetfieldtype.geographicCoverage.title=Couverture gographique
+datasetfieldtype.country.title=Pays / Nation
+datasetfieldtype.state.title=tat / Province
+datasetfieldtype.city.title=Ville
+datasetfieldtype.otherGeographicCoverage.title=Autre
+datasetfieldtype.geographicUnit.title=Unit gographique
+datasetfieldtype.geographicBoundingBox.title=Zone de dlimitation gographique
+datasetfieldtype.westLongitude.title=Longitude ouest
+datasetfieldtype.eastLongitude.title=Longitude est
+datasetfieldtype.northLongitude.title=Latitude nord
+datasetfieldtype.southLongitude.title=Latitude sud
+datasetfieldtype.geographicCoverage.description=Renseignements sur la couverture gographique des donnes, notamment la porte gographique totale des donnes.
+datasetfieldtype.country.description=Le pays ou la nation vis par l'ensemble de donnes.
+datasetfieldtype.state.description=L'tat ou la province dont l'ensemble de donnes traite. Utiliser GeoNames pour connatre l'orthographe exact et viter les abrviations.
+datasetfieldtype.city.description=Le nom de la ville dont l'ensemble de donnes traite. Utiliser GeoNames pour connatre l'orthographe exact et viter les abrviations.  
+datasetfieldtype.otherGeographicCoverage.description=Autres renseignements sur la couverture gographique des donnes.
+datasetfieldtype.geographicUnit.description=Niveau de regroupement gographique le plus bas couvert par l'ensemble de donnes, p.ex. village, pays, rgion.
+datasetfieldtype.geographicBoundingBox.description=La zone de dlimitation gographique est la description gographique fondamentale de tout ensemble de donnes qui modlise la gographie. Elle dcrit la zone minimale, dfinie par des longitudes ouest et est et des latitudes nord et sud, qui comprend la plus importante tendue gographique de la couverture gographique de l'ensemble de donnes. Cet lment est utilis dans le premier survol d'une recherche fonde sur les coordonnes. L'inclusion de cet lment dans le manuel de codes est recommande et est obligatoire si la zone polygone dlimite est incluse.
+datasetfieldtype.westLongitude.description=Les coordonnes les plus  l'ouest dlimitant l'tendue gographique de l'ensemble de donnes. Une fourchette de valeurs valide, exprime en degrs dcimaux, correspond  -180,0 <=  Valeur de longitude ouest de dlimitation <= 180,0.
+datasetfieldtype.eastLongitude.description=Les coordonnes les plus  l'est dlimitant l'tendue gographique de l'ensemble de donnes. Une fourchette de valeurs valide, exprime en degrs dcimaux, correspond  -180,0 <=  Valeur de longitude est de dlimitation <= 180,0.
+datasetfieldtype.northLongitude.description=Les coordonnes les plus au nord dlimitant l'tendue gographique de l'ensemble de donnes. Une fourchette de valeurs valide, exprime en degrs dcimaux, correspond  -90,0 <=  Valeur de latitude nord de dlimitation <= 90,0.
+datasetfieldtype.southLongitude.description=Les coordonnes les plus au sud dlimitant l'tendue gographique de l'ensemble de donnes. Une fourchette de valeurs valide, exprime en degrs dcimaux, correspond  -90,0 <=  Valeur de latitude sud de dlimitation <= 90,0.
+datasetfieldtype.geographicCoverage.watermark=
+datasetfieldtype.country.watermark=
+datasetfieldtype.state.watermark=
+datasetfieldtype.city.watermark=
+datasetfieldtype.otherGeographicCoverage.watermark=
+datasetfieldtype.geographicUnit.watermark=
+datasetfieldtype.geographicBoundingBox.watermark=
+datasetfieldtype.westLongitude.watermark=
+datasetfieldtype.eastLongitude.watermark=
+datasetfieldtype.northLongitude.watermark=
+datasetfieldtype.southLongitude.watermark=
+controlledvocabulary.country.afghanistan=Afghanistan
+controlledvocabulary.country.albania=Albanie
+controlledvocabulary.country.algeria=Algrie
+controlledvocabulary.country.american_samoa=Samoa amricaine
+controlledvocabulary.country.andorra=Andorre
+controlledvocabulary.country.angola=Angola
+controlledvocabulary.country.anguilla=Anguilla
+controlledvocabulary.country.antarctica=Antarctique
+controlledvocabulary.country.antigua_and_barbuda=Antigua-et-Barbuda
+controlledvocabulary.country.argentina=Argentine
+controlledvocabulary.country.armenia=Armnie
+controlledvocabulary.country.aruba=Aruba
+controlledvocabulary.country.australia=Australie
+controlledvocabulary.country.austria=Autriche
+controlledvocabulary.country.azerbaijan=Azerbadjan
+controlledvocabulary.country.bahamas=Bahamas
+controlledvocabulary.country.bahrain=Bahren
+controlledvocabulary.country.bangladesh=Bangladesh
+controlledvocabulary.country.barbados=Barbade
+controlledvocabulary.country.belarus=Blarus
+controlledvocabulary.country.belgium=Belgique
+controlledvocabulary.country.belize=Belize
+controlledvocabulary.country.benin=Bnin
+controlledvocabulary.country.bermuda=Bermudes
+controlledvocabulary.country.bhutan=Bhoutan
+controlledvocabulary.country.bolivia,_plurinational_state_of=Bolivie
+controlledvocabulary.country.bonaire,_sint_eustatius_and_saba=Bonaire, Saint-Eustache et Saba
+controlledvocabulary.country.bosnia_and_herzegovina=Bosnie-Herzgovine
+controlledvocabulary.country.botswana=Botswana
+controlledvocabulary.country.bouvet_island=le Bouvet
+controlledvocabulary.country.brazil=Brsil
+controlledvocabulary.country.british_indian_ocean_territory=Territoire britannique de l'ocan Indien
+controlledvocabulary.country.brunei_darussalam=Bruni Darussalam
+controlledvocabulary.country.bulgaria=Bulgarie
+controlledvocabulary.country.burkina_faso=Burkina Faso
+controlledvocabulary.country.burundi=Burundi
+controlledvocabulary.country.cambodia=Cambodge
+controlledvocabulary.country.cameroon=Cameroun
+controlledvocabulary.country.canada=Canada
+controlledvocabulary.country.cape_verde=Cap-Vert
+controlledvocabulary.country.cayman_islands=les Camans
+controlledvocabulary.country.central_african_republic=Rpublique centrafricaine
+controlledvocabulary.country.chad=Tchad
+controlledvocabulary.country.chile=Chili
+controlledvocabulary.country.china=Chine
+controlledvocabulary.country.christmas_island=le Christmas
+controlledvocabulary.country.cocos_(keeling)_islands=les Cocos (Keeling)
+controlledvocabulary.country.colombia=Colombie
+controlledvocabulary.country.comoros=Comores
+controlledvocabulary.country.congo=Congo
+controlledvocabulary.country.congo,_the_democratic_republic_of_the=Congo, Rpublique dmocratique du
+controlledvocabulary.country.cook_islands=les Cook
+controlledvocabulary.country.costa_rica=Costa Rica
+controlledvocabulary.country.croatia=Croatie
+controlledvocabulary.country.cuba=Cuba
+controlledvocabulary.country.curacao=Curaao
+controlledvocabulary.country.cyprus=Chypre
+controlledvocabulary.country.czech_republic=Rpublique tchque
+controlledvocabulary.country.cote_d'ivoire=Cte d'Ivoire
+controlledvocabulary.country.denmark=Danemark
+controlledvocabulary.country.djibouti=Djibouti
+controlledvocabulary.country.dominica=Dominique
+controlledvocabulary.country.dominican_republic=Rpublique dominicaine
+controlledvocabulary.country.ecuador=quateur
+controlledvocabulary.country.egypt=gypte
+controlledvocabulary.country.el_salvador=El Salvador
+controlledvocabulary.country.equatorial_guinea=Guine quatoriale
+controlledvocabulary.country.eritrea=rythre
+controlledvocabulary.country.estonia=Estonie
+controlledvocabulary.country.ethiopia=thiopie
+controlledvocabulary.country.falkland_islands_(malvinas)=les Falkland (Malouines)
+controlledvocabulary.country.faroe_islands=les Fro
+controlledvocabulary.country.fiji=Fidji
+controlledvocabulary.country.finland=Finlande
+controlledvocabulary.country.france=France
+controlledvocabulary.country.french_guiana=Guyane franaise
+controlledvocabulary.country.french_polynesia=Polynsie franaise
+controlledvocabulary.country.french_southern_territories=Terres australes franaises
+controlledvocabulary.country.gabon=Gabon
+controlledvocabulary.country.gambia=Gambie
+controlledvocabulary.country.georgia=Gorgie
+controlledvocabulary.country.germany=Allemagne
+controlledvocabulary.country.ghana=Ghana
+controlledvocabulary.country.gibraltar=Gibraltar
+controlledvocabulary.country.greece=Grce
+controlledvocabulary.country.greenland=Groenland
+controlledvocabulary.country.grenada=Grenade
+controlledvocabulary.country.guadeloupe=Guadeloupe
+controlledvocabulary.country.guam=Guam
+controlledvocabulary.country.guatemala=Guatemala
+controlledvocabulary.country.guernsey=Guernesey
+controlledvocabulary.country.guinea=Guine
+controlledvocabulary.country.guinea-bissau=Guine-Bissau
+controlledvocabulary.country.guyana=Guyana
+controlledvocabulary.country.haiti=Hati
+controlledvocabulary.country.heard_island_and_mcdonald_islands=les Heard et McDonald
+controlledvocabulary.country.holy_see_(vatican_city_state)=Saint-Sige (tat de la Cit du Vatican)
+controlledvocabulary.country.honduras=Honduras
+controlledvocabulary.country.hong_kong=Hong Kong
+controlledvocabulary.country.hungary=Hongrie
+controlledvocabulary.country.iceland=Islande
+controlledvocabulary.country.india=Inde
+controlledvocabulary.country.indonesia=Indonsie
+controlledvocabulary.country.iran,_islamic_republic_of=Iran
+controlledvocabulary.country.iraq=Iraq
+controlledvocabulary.country.ireland=Irlande
+controlledvocabulary.country.isle_of_man=le de Man
+controlledvocabulary.country.israel=Isral
+controlledvocabulary.country.italy=Italie
+controlledvocabulary.country.jamaica=Jamaque
+controlledvocabulary.country.japan=Japon
+controlledvocabulary.country.jersey=Jersey
+controlledvocabulary.country.jordan=Jordanie
+controlledvocabulary.country.kazakhstan=Kazakhstan
+controlledvocabulary.country.kenya=Kenya
+controlledvocabulary.country.kiribati=Kiribati
+controlledvocabulary.country.korea,_democratic_people's_republic_of=Core du Nord
+controlledvocabulary.country.korea,_republic_of=Core du Sud
+controlledvocabulary.country.kuwait=Kowet
+controlledvocabulary.country.kyrgyzstan=Kirghizistan
+controlledvocabulary.country.lao_people's_democratic_republic=Laos
+controlledvocabulary.country.latvia=Lettonie
+controlledvocabulary.country.lebanon=Liban
+controlledvocabulary.country.lesotho=Lesotho
+controlledvocabulary.country.liberia=Libria
+controlledvocabulary.country.libya=Libye
+controlledvocabulary.country.liechtenstein=Liechtenstein
+controlledvocabulary.country.lithuania=Lituanie
+controlledvocabulary.country.luxembourg=Luxembourg
+controlledvocabulary.country.macao=Macao
+controlledvocabulary.country.macedonia,_the_former_yugoslav_republic_of=Ancienne Rpublique yougoslave de Macdoine
+controlledvocabulary.country.madagascar=Madagascar
+controlledvocabulary.country.malawi=Malawi
+controlledvocabulary.country.malaysia=Malaisie
+controlledvocabulary.country.maldives=Maldives
+controlledvocabulary.country.mali=Mali
+controlledvocabulary.country.malta=Malte
+controlledvocabulary.country.marshall_islands=les Marshall
+controlledvocabulary.country.martinique=Martinique
+controlledvocabulary.country.mauritania=Mauritanie
+controlledvocabulary.country.mauritius=Maurice
+controlledvocabulary.country.mayotte=Mayotte
+controlledvocabulary.country.mexico=Mexique
+controlledvocabulary.country.micronesia,_federated_states_of=Micronsie
+controlledvocabulary.country.moldova,_republic_of=Moldavie
+controlledvocabulary.country.monaco=Monaco
+controlledvocabulary.country.mongolia=Mongolie
+controlledvocabulary.country.montenegro=Montngro
+controlledvocabulary.country.montserrat=Montserrat
+controlledvocabulary.country.morocco=Maroc
+controlledvocabulary.country.mozambique=Mozambique
+controlledvocabulary.country.myanmar=Myanmar
+controlledvocabulary.country.namibia=Namibie
+controlledvocabulary.country.nauru=Nauru
+controlledvocabulary.country.nepal=Npal
+controlledvocabulary.country.netherlands=Pays-Bas
+controlledvocabulary.country.new_caledonia=Nouvelle-Caldonie
+controlledvocabulary.country.new_zealand=Nouvelle-Zlande
+controlledvocabulary.country.nicaragua=Nicaragua
+controlledvocabulary.country.niger=Niger
+controlledvocabulary.country.nigeria=Nigeria
+controlledvocabulary.country.niue=Niou
+controlledvocabulary.country.norfolk_island=Norfolk
+controlledvocabulary.country.northern_mariana_islands=Mariannes du Nord
+controlledvocabulary.country.norway=Norvge
+controlledvocabulary.country.oman=Oman
+controlledvocabulary.country.pakistan=Pakistan
+controlledvocabulary.country.palau=Palaos
+controlledvocabulary.country.palestine,_state_of=Palestine
+controlledvocabulary.country.panama=Panama
+controlledvocabulary.country.papua_new_guinea=Papouasie-Nouvelle-Guine
+controlledvocabulary.country.paraguay=Paraguay
+controlledvocabulary.country.peru=Prou
+controlledvocabulary.country.philippines=Philippines
+controlledvocabulary.country.pitcairn=Pitcairn
+controlledvocabulary.country.poland=Pologne
+controlledvocabulary.country.portugal=Portugal
+controlledvocabulary.country.puerto_rico=Porto Rico
+controlledvocabulary.country.qatar=Qatar
+controlledvocabulary.country.romania=Roumanie
+controlledvocabulary.country.russian_federation=Russie
+controlledvocabulary.country.rwanda=Rwanda
+controlledvocabulary.country.reunion=Runion
+controlledvocabulary.country.saint_barthelemy=Saint-Barthlemy
+controlledvocabulary.country.saint_helena,_ascension_and_tristan_da_cunha=Sainte-Hlne, Ponape et Tristan da Cunha
+controlledvocabulary.country.saint_kitts_and_nevis=Saint-Kitts-et-Nevis
+controlledvocabulary.country.saint_lucia=Sainte-Lucie
+controlledvocabulary.country.saint_martin_(french_part)=Saint-Martin (partie franaise)
+controlledvocabulary.country.saint_pierre_and_miquelon=Saint-Pierre et Miquelon
+controlledvocabulary.country.saint_vincent_and_the_grenadines=Saint-Vincent-et-les Grenadines
+controlledvocabulary.country.samoa=Samoa
+controlledvocabulary.country.san_marino=Saint-Marin
+controlledvocabulary.country.sao_tome_and_principe=Sao Tom-et-Principe
+controlledvocabulary.country.saudi_arabia=Arabie saoudite
+controlledvocabulary.country.senegal=Sngal
+controlledvocabulary.country.serbia=Serbie
+controlledvocabulary.country.seychelles=Seychelles
+controlledvocabulary.country.sierra_leone=Sierra Leone
+controlledvocabulary.country.singapore=Singapour
+controlledvocabulary.country.sint_maarten_(dutch_part)=Saint-Martin (partie nerlandaise)
+controlledvocabulary.country.slovakia=Slovaquie
+controlledvocabulary.country.slovenia=Slovnie
+controlledvocabulary.country.solomon_islands=les Salomon
+controlledvocabulary.country.somalia=Somalie
+controlledvocabulary.country.south_africa=Afrique du Sud
+controlledvocabulary.country.south_georgia_and_the_south_sandwich_islands=Gorgie du Sud et les les Sandwich du Sud
+controlledvocabulary.country.south_sudan=Soudan du Sud
+controlledvocabulary.country.spain=Espagne
+controlledvocabulary.country.sri_lanka=Sri Lanka
+controlledvocabulary.country.sudan=Soudan
+controlledvocabulary.country.suriname=Suriname
+controlledvocabulary.country.svalbard_and_jan_mayen=Svalbard et le de Jan Mayen
+controlledvocabulary.country.swaziland=Swaziland
+controlledvocabulary.country.sweden=Sude
+controlledvocabulary.country.switzerland=Suisse
+controlledvocabulary.country.syrian_arab_republic=Syrie
+controlledvocabulary.country.taiwan,_province_of_china=Tawan, province de Chine
+controlledvocabulary.country.tajikistan=Tadjikistan
+controlledvocabulary.country.tanzania,_united_republic_of=Tanzanie
+controlledvocabulary.country.thailand=Thalande
+controlledvocabulary.country.timor-leste=Timor-Leste
+controlledvocabulary.country.togo=Togo
+controlledvocabulary.country.tokelau=Tokelau
+controlledvocabulary.country.tonga=Tonga
+controlledvocabulary.country.trinidad_and_tobago=Trinit-et-Tobago
+controlledvocabulary.country.tunisia=Tunisie
+controlledvocabulary.country.turkey=Turquie
+controlledvocabulary.country.turkmenistan=Turkmnistan
+controlledvocabulary.country.turks_and_caicos_islands=les Turks et Caicos
+controlledvocabulary.country.tuvalu=Tuvalu
+controlledvocabulary.country.uganda=Ouganda
+controlledvocabulary.country.ukraine=Ukraine
+controlledvocabulary.country.united_arab_emirates=mirats arabes unis
+controlledvocabulary.country.united_kingdom=Royaume-Uni
+controlledvocabulary.country.united_states=tats-Unis
+controlledvocabulary.country.united_states_minor_outlying_islands=Petites les excentriques des tats-Unis
+controlledvocabulary.country.uruguay=Uruguay
+controlledvocabulary.country.uzbekistan=Ouzbkistan
+controlledvocabulary.country.vanuatu=Vanuatu
+controlledvocabulary.country.venezuela,_bolivarian_republic_of=Venezuela
+controlledvocabulary.country.viet_nam=Vietnam
+controlledvocabulary.country.virgin_islands,_british=les Vierges britanniques
+controlledvocabulary.country.virgin_islands,_u.s.=les Vierges amricaine
+controlledvocabulary.country.wallis_and_futuna=Wallis-et-Futuna
+controlledvocabulary.country.western_sahara=Rpublique arabe sahraouie dmocratique
+controlledvocabulary.country.yemen=Ymen
+controlledvocabulary.country.zambia=Zambie
+controlledvocabulary.country.zimbabwe=Zimbabwe
+controlledvocabulary.country.aland_islands=land
\ No newline at end of file
diff --git a/src/main/java/journal.properties b/src/main/java/journal.properties
new file mode 100644
index 00000000000..e17a9bd6d89
--- /dev/null
+++ b/src/main/java/journal.properties
@@ -0,0 +1,49 @@
+metadatablock.name=journal
+metadatablock.displayName=Journal Metadata
+datasetfieldtype.journalVolumeIssue.title=Journal
+datasetfieldtype.journalVolume.title=Volume
+datasetfieldtype.journalIssue.title=Issue
+datasetfieldtype.journalPubDate.title=Publication Date
+datasetfieldtype.journalArticleType.title=Type of Article
+datasetfieldtype.journalVolumeIssue.description=Indicates the volume, issue and date of a journal, which this Dataset is associated with.
+datasetfieldtype.journalVolume.description=The journal volume which this Dataset is associated with (e.g., Volume 4).
+datasetfieldtype.journalIssue.description=The journal issue number which this Dataset is associated with (e.g., Number 2, Autumn).
+datasetfieldtype.journalPubDate.description=The publication date for this journal volume/issue, which this Dataset is associated with (e.g., 1999).
+datasetfieldtype.journalArticleType.description=Indicates what kind of article this is, for example, a research article, a commentary, a book or product review, a case report, a calendar, etc (based on JATS).
+datasetfieldtype.journalVolumeIssue.watermark=
+datasetfieldtype.journalVolume.watermark=
+datasetfieldtype.journalIssue.watermark=
+datasetfieldtype.journalPubDate.watermark=YYYY or YYYY-MM or YYYY-MM-DD
+datasetfieldtype.journalArticleType.watermark=
+controlledvocabulary.journalArticleType.abstract=abstract
+controlledvocabulary.journalArticleType.addendum=addendum
+controlledvocabulary.journalArticleType.announcement=announcement
+controlledvocabulary.journalArticleType.article-commentary=article-commentary
+controlledvocabulary.journalArticleType.book_review=book review
+controlledvocabulary.journalArticleType.books_received=books received
+controlledvocabulary.journalArticleType.brief_report=brief report
+controlledvocabulary.journalArticleType.calendar=calendar
+controlledvocabulary.journalArticleType.case_report=case report
+controlledvocabulary.journalArticleType.collection=collection
+controlledvocabulary.journalArticleType.correction=correction
+controlledvocabulary.journalArticleType.data_paper=data paper
+controlledvocabulary.journalArticleType.discussion=discussion
+controlledvocabulary.journalArticleType.dissertation=dissertation
+controlledvocabulary.journalArticleType.editorial=editorial
+controlledvocabulary.journalArticleType.in_brief=in brief
+controlledvocabulary.journalArticleType.introduction=introduction
+controlledvocabulary.journalArticleType.letter=letter
+controlledvocabulary.journalArticleType.meeting_report=meeting report
+controlledvocabulary.journalArticleType.news=news
+controlledvocabulary.journalArticleType.obituary=obituary
+controlledvocabulary.journalArticleType.oration=oration
+controlledvocabulary.journalArticleType.partial_retraction=partial retraction
+controlledvocabulary.journalArticleType.product_review=product review
+controlledvocabulary.journalArticleType.rapid_communication=rapid communication
+controlledvocabulary.journalArticleType.reply=reply
+controlledvocabulary.journalArticleType.reprint=reprint
+controlledvocabulary.journalArticleType.research_article=research article
+controlledvocabulary.journalArticleType.retraction=retraction
+controlledvocabulary.journalArticleType.review_article=review article
+controlledvocabulary.journalArticleType.translation=translation
+controlledvocabulary.journalArticleType.other=other
\ No newline at end of file
diff --git a/src/main/java/journal_fr.properties b/src/main/java/journal_fr.properties
new file mode 100644
index 00000000000..f656f2310dc
--- /dev/null
+++ b/src/main/java/journal_fr.properties
@@ -0,0 +1,49 @@
+metadatablock.name=journal
+metadatablock.displayName=Mtadonnes lies  la revue
+datasetfieldtype.journalVolumeIssue.title=Revue
+datasetfieldtype.journalVolume.title=Volume
+datasetfieldtype.journalIssue.title=Numro
+datasetfieldtype.journalPubDate.title=Date de publication
+datasetfieldtype.journalArticleType.title=Type d'article
+datasetfieldtype.journalVolumeIssue.description=Comprend le volume, le numro et la date de publication de la revue  laquelle cet ensemble de donnes est associ.
+datasetfieldtype.journalVolume.description=Volume de la revue associ  cet ensemble de donnes (p.ex. le volume4).
+datasetfieldtype.journalIssue.description=Numro de la revue associ  cet ensemble de donnes (p.ex. numro 2, automne).
+datasetfieldtype.journalPubDate.description=Date de publication du volume/numro de cette revue associ  cet ensemble de donnes (p.ex. 1999).
+datasetfieldtype.journalArticleType.description=Indique le type d'article dont il s'agit, par exemple un article de recherche, un commentaire, une critique de livre ou de produit, une tude de cas, un calendrier, etc. (en fonction du JATS)
+datasetfieldtype.journalVolumeIssue.watermark=
+datasetfieldtype.journalVolume.watermark=
+datasetfieldtype.journalIssue.watermark=
+datasetfieldtype.journalPubDate.watermark=AAAA ou AAAA-MM ou AAAA-MM-JJ
+datasetfieldtype.journalArticleType.watermark=
+controlledvocabulary.journalArticleType.abstract=Rsum
+controlledvocabulary.journalArticleType.addendum=Addenda
+controlledvocabulary.journalArticleType.announcement=Annonce
+controlledvocabulary.journalArticleType.article-commentary=Article-commentaire
+controlledvocabulary.journalArticleType.book_review=Critique de livre
+controlledvocabulary.journalArticleType.books_received=Livres reus
+controlledvocabulary.journalArticleType.brief_report=Rapport sommaire
+controlledvocabulary.journalArticleType.calendar=Calendrier
+controlledvocabulary.journalArticleType.case_report=tude de cas
+controlledvocabulary.journalArticleType.collection=Collection
+controlledvocabulary.journalArticleType.correction=Correction
+controlledvocabulary.journalArticleType.data_paper=Document sur les donnes
+controlledvocabulary.journalArticleType.discussion=Discussion
+controlledvocabulary.journalArticleType.dissertation=Dissertation
+controlledvocabulary.journalArticleType.editorial=ditorial
+controlledvocabulary.journalArticleType.in_brief=En rsum
+controlledvocabulary.journalArticleType.introduction=Introduction
+controlledvocabulary.journalArticleType.letter=Lettre
+controlledvocabulary.journalArticleType.meeting_report=Rapport de runion
+controlledvocabulary.journalArticleType.news=Nouvelles
+controlledvocabulary.journalArticleType.obituary=Article ncrologique
+controlledvocabulary.journalArticleType.oration=Discours
+controlledvocabulary.journalArticleType.partial_retraction=Rtractation partielle
+controlledvocabulary.journalArticleType.product_review=Examen des produits
+controlledvocabulary.journalArticleType.rapid_communication=Communication rapide
+controlledvocabulary.journalArticleType.reply=Rponse
+controlledvocabulary.journalArticleType.reprint=Rimpression
+controlledvocabulary.journalArticleType.research_article=Article de recherche
+controlledvocabulary.journalArticleType.retraction=Rtractation
+controlledvocabulary.journalArticleType.review_article=Mise au point
+controlledvocabulary.journalArticleType.translation=Traduction
+controlledvocabulary.journalArticleType.other=Autre
\ No newline at end of file
diff --git a/src/main/java/socialscience.properties b/src/main/java/socialscience.properties
new file mode 100644
index 00000000000..91e73fa78b9
--- /dev/null
+++ b/src/main/java/socialscience.properties
@@ -0,0 +1,80 @@
+metadatablock.name=socialscience
+metadatablock.displayName=Social Science and Humanities Metadata
+datasetfieldtype.unitOfAnalysis.title=Unit of Analysis
+datasetfieldtype.universe.title=Universe
+datasetfieldtype.timeMethod.title=Time Method
+datasetfieldtype.dataCollector.title=Data Collector
+datasetfieldtype.collectorTraining.title=Collector Training
+datasetfieldtype.frequencyOfDataCollection.title=Frequency
+datasetfieldtype.samplingProcedure.title=Sampling Procedure
+datasetfieldtype.targetSampleSize.title=Target Sample Size
+datasetfieldtype.targetSampleActualSize.title=Actual
+datasetfieldtype.targetSampleSizeFormula.title=Formula
+datasetfieldtype.deviationsFromSampleDesign.title=Major Deviations for Sample Design
+datasetfieldtype.collectionMode.title=Collection Mode
+datasetfieldtype.researchInstrument.title=Type of Research Instrument
+datasetfieldtype.dataCollectionSituation.title=Characteristics of Data Collection Situation
+datasetfieldtype.actionsToMinimizeLoss.title=Actions to Minimize Losses
+datasetfieldtype.controlOperations.title=Control Operations
+datasetfieldtype.weighting.title=Weighting
+datasetfieldtype.cleaningOperations.title=Cleaning Operations
+datasetfieldtype.datasetLevelErrorNotes.title=Study Level Error Notes
+datasetfieldtype.responseRate.title=Response Rate
+datasetfieldtype.samplingErrorEstimates.title=Estimates of Sampling Error
+datasetfieldtype.otherDataAppraisal.title=Other Forms of Data Appraisal
+datasetfieldtype.socialScienceNotes.title=Notes
+datasetfieldtype.socialScienceNotesType.title=Type
+datasetfieldtype.socialScienceNotesSubject.title=Subject
+datasetfieldtype.socialScienceNotesText.title=Text
+datasetfieldtype.unitOfAnalysis.description=Basic unit of analysis or observation that this Dataset describes, such as individuals, families/households, groups, institutions/organizations, administrative units, and more. For information about the DDI's controlled vocabulary for this element, please refer to the DDI web page at http://www.ddialliance.org/controlled-vocabularies.
+datasetfieldtype.universe.description=Description of the population covered by the data in the file; the group of people or other elements that are the object of the study and to which the study results refer. Age, nationality, and residence commonly help to  delineate a given universe, but any number of other factors may be used, such as age limits, sex, marital status, race, ethnic group, nationality, income, veteran status, criminal convictions, and more. The universe may consist of elements other than persons, such as housing units, court cases, deaths, countries, and so on. In general, it should be possible to tell from the description of the universe whether a given individual or element is a member of the population under study. Also known as the universe of interest, population of interest, and target population.
+datasetfieldtype.timeMethod.description=The time method or time dimension of the data collection, such as panel, cross-sectional, trend, time- series, or other.
+datasetfieldtype.dataCollector.description=Individual, agency or organization responsible for  administering the questionnaire or interview or compiling the data.
+datasetfieldtype.collectorTraining.description=Type of training provided to the data collector
+datasetfieldtype.frequencyOfDataCollection.description=If the data collected includes more than one point in time, indicate the frequency with which the data was collected; that is, monthly, quarterly, or other.
+datasetfieldtype.samplingProcedure.description=Type of sample and sample design used to select the survey respondents to represent the population. May include reference to the target sample size and the sampling fraction.
+datasetfieldtype.targetSampleSize.description=Specific information regarding the target sample size, actual  sample size, and the formula used to determine this.
+datasetfieldtype.targetSampleActualSize.description=Actual sample size.
+datasetfieldtype.targetSampleSizeFormula.description=Formula used to determine target sample size.
+datasetfieldtype.deviationsFromSampleDesign.description=Show correspondence as well as discrepancies between the sampled units (obtained) and available statistics for the population (age, sex-ratio, marital status, etc.) as a whole.
+datasetfieldtype.collectionMode.description=Method used to collect the data; instrumentation characteristics (e.g., telephone interview, mail questionnaire, or other).
+datasetfieldtype.researchInstrument.description=Type of data collection instrument used. Structured indicates an instrument in which all respondents are asked the same questions/tests, possibly with precoded answers. If a small portion of such a questionnaire includes open-ended questions, provide appropriate comments. Semi-structured indicates that the research instrument contains mainly open-ended questions. Unstructured indicates that in-depth interviews were conducted.
+datasetfieldtype.dataCollectionSituation.description=Description of noteworthy aspects of the data collection situation. Includes information on factors such as cooperativeness of respondents, duration of interviews, number of call backs, or similar.
+datasetfieldtype.actionsToMinimizeLoss.description=Summary of actions taken to minimize data loss. Include information on actions such as follow-up visits, supervisory checks, historical matching, estimation, and so on.
+datasetfieldtype.controlOperations.description=Control OperationsMethods to facilitate data control performed by the primary investigator or by the data archive.
+datasetfieldtype.weighting.description=The use of sampling procedures might make it necessary to apply weights to produce accurate statistical results. Describes the criteria for using weights in analysis of a collection. If a weighting formula or coefficient was developed, the formula is provided, its elements are defined, and it is indicated how the formula was applied to the data.
+datasetfieldtype.cleaningOperations.description=Methods used to clean the data collection, such as consistency checking, wildcode checking, or other.
+datasetfieldtype.datasetLevelErrorNotes.description=Note element used for any information annotating or clarifying the methodology and processing of the study.
+datasetfieldtype.responseRate.description=Percentage of sample members who provided information.
+datasetfieldtype.samplingErrorEstimates.description=Measure of how precisely one can estimate a population value from a given sample.
+datasetfieldtype.otherDataAppraisal.description=Other issues pertaining to the data appraisal. Describe issues such as response variance, nonresponse rate  and testing for bias, interviewer and response bias, confidence levels, question bias, or similar.
+datasetfieldtype.socialScienceNotes.description=General notes about this Dataset.
+datasetfieldtype.socialScienceNotesType.description=Type of note.
+datasetfieldtype.socialScienceNotesSubject.description=Note subject.
+datasetfieldtype.socialScienceNotesText.description=Text for this note.
+datasetfieldtype.unitOfAnalysis.watermark=
+datasetfieldtype.universe.watermark=
+datasetfieldtype.timeMethod.watermark=
+datasetfieldtype.dataCollector.watermark=FamilyName, GivenName or Organization
+datasetfieldtype.collectorTraining.watermark=
+datasetfieldtype.frequencyOfDataCollection.watermark=
+datasetfieldtype.samplingProcedure.watermark=
+datasetfieldtype.targetSampleSize.watermark=
+datasetfieldtype.targetSampleActualSize.watermark=Enter an integer...
+datasetfieldtype.targetSampleSizeFormula.watermark=
+datasetfieldtype.deviationsFromSampleDesign.watermark=
+datasetfieldtype.collectionMode.watermark=
+datasetfieldtype.researchInstrument.watermark=
+datasetfieldtype.dataCollectionSituation.watermark=
+datasetfieldtype.actionsToMinimizeLoss.watermark=
+datasetfieldtype.controlOperations.watermark=
+datasetfieldtype.weighting.watermark=
+datasetfieldtype.cleaningOperations.watermark=
+datasetfieldtype.datasetLevelErrorNotes.watermark=
+datasetfieldtype.responseRate.watermark=
+datasetfieldtype.samplingErrorEstimates.watermark=
+datasetfieldtype.otherDataAppraisal.watermark=
+datasetfieldtype.socialScienceNotes.watermark=
+datasetfieldtype.socialScienceNotesType.watermark=
+datasetfieldtype.socialScienceNotesSubject.watermark=
+datasetfieldtype.socialScienceNotesText.watermark=
\ No newline at end of file
diff --git a/src/main/java/socialscience_fr.properties b/src/main/java/socialscience_fr.properties
new file mode 100644
index 00000000000..fce10adf70e
--- /dev/null
+++ b/src/main/java/socialscience_fr.properties
@@ -0,0 +1,80 @@
+metadatablock.name=socialscience
+metadatablock.displayName=Mtadonnes sur les sciences sociales et les sciences humaines
+datasetfieldtype.unitOfAnalysis.title=Unit d'analyse
+datasetfieldtype.universe.title=Univers
+datasetfieldtype.timeMethod.title=Mthode temporelle
+datasetfieldtype.dataCollector.title=Responsable de la collecte de donnes
+datasetfieldtype.collectorTraining.title=Formation du responsable de la collecte de donnes
+datasetfieldtype.frequencyOfDataCollection.title=Frquence
+datasetfieldtype.samplingProcedure.title=Mthode d?chantillonnage
+datasetfieldtype.targetSampleSize.title=Taille de l'chantillon cible
+datasetfieldtype.targetSampleActualSize.title=Relle
+datasetfieldtype.targetSampleSizeFormula.title=Formule
+datasetfieldtype.deviationsFromSampleDesign.title=carts importants pour le plan d'chantillonnage
+datasetfieldtype.collectionMode.title=Mode de collecte
+datasetfieldtype.researchInstrument.title=Type d'instrument de recherche
+datasetfieldtype.dataCollectionSituation.title=Caractristiques de la collecte de donnes
+datasetfieldtype.actionsToMinimizeLoss.title=Mesures visant  minimiser les pertes
+datasetfieldtype.controlOperations.title=Oprations de contrle
+datasetfieldtype.weighting.title=Pondration
+datasetfieldtype.cleaningOperations.title=Oprations de nettoyage
+datasetfieldtype.datasetLevelErrorNotes.title=Remarques gnrales d'erreur
+datasetfieldtype.responseRate.title=Taux de rponse
+datasetfieldtype.samplingErrorEstimates.title=Estimation de l'erreur d'chantillonnage
+datasetfieldtype.otherDataAppraisal.title=Autres formes d'valuation des donnes
+datasetfieldtype.socialScienceNotes.title=Remarques
+datasetfieldtype.socialScienceNotesType.title=Type
+datasetfieldtype.socialScienceNotesSubject.title=Objet
+datasetfieldtype.socialScienceNotesText.title=Texte
+datasetfieldtype.unitOfAnalysis.description=Unit de base pour l'analyse ou l'observation dcrite par cet ensemble de donnes, comme les personnes, familles/mnages, groupes, tablissements/organisations, units administratives et autres. Pour de l'information sur le vocabulaire contrl de la DDI pour cet lment, visiter la page Web de la DDI  l'adresse http://www.ddialliance.org/controlled-vocabularies (en anglais).
+datasetfieldtype.universe.description=Description de la population couverte par les donnes contenues dans le fichier; le groupe de personnes ou autres lments qui constituent l?objet de l?enqute et auxquels les rsultats de l?enqute font rfrence. L?ge, la nationalit et le lieu de rsidence sont communment employs pour dlimiter un univers donn mais n?importe quel facteur peut tre invoqu comme les limites d?ge, le sexe, l?tat matrimonial, la race, le groupe ethnique, la nationalit, le revenu, le statut d?ancien combattant, les condamnations au criminel et autres. L'univers peut comprendre des lments autres que des personnes, comme le logement, les affaires judiciaires, les dcs, les pays, etc. En gnral, il doit tre possible de dire,  partir de la description de l'univers, dans quelle mesure une personne ou un lment donn est membre de la population tudie. L?univers c?est aussi les centres d?intrt, la population d'intrt, la population cible.
+datasetfieldtype.timeMethod.description=Mthode temporelle utilise ou dimension temporelle de la collecte des donnes (mthode par panel, transversale, chronologique, srie temporelle ou autre).
+datasetfieldtype.dataCollector.description=Personne, organisme ou organisation responsable de l?administration du questionnaire, de l?entrevue ou de la compilation des donnes.
+datasetfieldtype.collectorTraining.description=Type de formation offerte au responsable de la collecte de donnes.
+datasetfieldtype.frequencyOfDataCollection.description=Si les donnes ont t recueillies  plus d?un point dans le temps, indiquer la frquence  laquelle les donnes ont t recueillies, par ex. tous les mois, tous les trimestres ou autre.
+datasetfieldtype.samplingProcedure.description=Le type d?chantillon et le plan d?chantillonnage utiliss pour slectionner les rpondants  l?enqute afin de reprsenter la population. Des indications sur la taille de l?chantillon cible et des fractions de l?chantillon peuvent tre mentionnes.
+datasetfieldtype.targetSampleSize.description=Des renseignements prcis sur la taille de l'chantillon cible, la taille relle de l'chantillon et la formule utilise pour dtermine la taille.
+datasetfieldtype.targetSampleActualSize.description=Taille relle de l'chantillon
+datasetfieldtype.targetSampleSizeFormula.description=Formule utilise pour dterminer la taille relle de l'chantillon.
+datasetfieldtype.deviationsFromSampleDesign.description=Indiquent les correspondances et les carts entre les units chantillonnes (obtenues) et les statistiques disponibles pour la population (ge, rapport hommes-femmes, situation familiale) dans son ensemble.
+datasetfieldtype.collectionMode.description=Mthode de collecte des donnes; caractristiques de l'instrument (p. ex. entrevue tlphonique, questionnaire envoy par la poste ou autre).
+datasetfieldtype.researchInstrument.description=Type d'instrument utilis pour la collecte de donnes. Un instrument structur correspond  un instrument o tous les rpondants doivent rpondre aux mmes questions ou faire les mmes tests, comportant possiblement des rponses codes. Si une petite partie d'un tel questionnaire comprend des questions ouvertes, fournir des informations  ce sujet. Un instrument semi-structur indique que l'instrument de recherche comprend principalement des questions ouvertes. Un instrument non structur indique que des entrevues approfondies ont t ralises.
+datasetfieldtype.dataCollectionSituation.description=Description des aspects notables de la collecte des donnes. Comprend des renseignements sur les facteurs comme le degr de coopration des rpondants, la dure des entrevues, le nombre de rappels ou des lments similaires.
+datasetfieldtype.actionsToMinimizeLoss.description=Rsum des mesures prises pour minimiser la perte de donnes. Comprend des renseignements sur les mesures comme les visites de suivi, les vrifications de surveillance, l'tablissement de correspondances historiques, les estimations, etc.
+datasetfieldtype.controlOperations.description=Mthodes utilises par le chercheur principal ou par les gestionnaires du dpt de donnes.pour faciliter le contrle des donnes.
+datasetfieldtype.weighting.description=La procdure d?chantillonnage utilise peut ncessiter l?application d?une pondration afin d?obtenir une plus grande prcision des rsultats statistiques. Dcrit les critres d?utilisation des pondrations employs dans l?analyse d?une collecte. Si un coefficient ou une formule de pondration est tabli, la formule est fournie, ses lments sont dfinis et la faon d'appliquer la formule aux donnes est indique.
+datasetfieldtype.cleaningOperations.description=Mthodes utilises pour nettoyer les donnes comme la vrification de la cohrence, la vrification de code non valide ou autre.
+datasetfieldtype.datasetLevelErrorNotes.description=Remarque utile pour annoter ou clarifier la mthode et le traitement de l'enqute.
+datasetfieldtype.responseRate.description=Pourcentage des membres de l'chantillon ayant fourni des renseignements.
+datasetfieldtype.samplingErrorEstimates.description=Mesure le degr de prcision selon lequel on peut estimer la valeur de la population pour un chantillon donn. 
+datasetfieldtype.otherDataAppraisal.description=Autres questions lies  l'valuation des donnes. Dcrit les questions comme la variance de rponse, le taux de non-rponse et la vrification de la partialit, la partialit de l'enquteur et de la rponse, le niveau de confiance, la partialit de la question ou autre lment similaire.
+datasetfieldtype.socialScienceNotes.description=Renseignements gnraux sur cet ensemble de donnes.
+datasetfieldtype.socialScienceNotesType.description=Type de remarque
+datasetfieldtype.socialScienceNotesSubject.description=Objet de la remarque
+datasetfieldtype.socialScienceNotesText.description=Texte pour cette remarque
+datasetfieldtype.unitOfAnalysis.watermark=
+datasetfieldtype.universe.watermark=
+datasetfieldtype.timeMethod.watermark=
+datasetfieldtype.dataCollector.watermark=Nom, prnom ou nom de l'organisation
+datasetfieldtype.collectorTraining.watermark=
+datasetfieldtype.frequencyOfDataCollection.watermark=
+datasetfieldtype.samplingProcedure.watermark=
+datasetfieldtype.targetSampleSize.watermark=
+datasetfieldtype.targetSampleActualSize.watermark=Entrer un nombre entier\u2026
+datasetfieldtype.targetSampleSizeFormula.watermark=
+datasetfieldtype.deviationsFromSampleDesign.watermark=
+datasetfieldtype.collectionMode.watermark=
+datasetfieldtype.researchInstrument.watermark=
+datasetfieldtype.dataCollectionSituation.watermark=
+datasetfieldtype.actionsToMinimizeLoss.watermark=
+datasetfieldtype.controlOperations.watermark=
+datasetfieldtype.weighting.watermark=
+datasetfieldtype.cleaningOperations.watermark=
+datasetfieldtype.datasetLevelErrorNotes.watermark=
+datasetfieldtype.responseRate.watermark=
+datasetfieldtype.samplingErrorEstimates.watermark=
+datasetfieldtype.otherDataAppraisal.watermark=
+datasetfieldtype.socialScienceNotes.watermark=
+datasetfieldtype.socialScienceNotesType.watermark=
+datasetfieldtype.socialScienceNotesSubject.watermark=
+datasetfieldtype.socialScienceNotesText.watermark=
\ No newline at end of file
diff --git a/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml
index ef26fe09bac..abe7ce79972 100644
--- a/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml
+++ b/src/main/resources/edu/harvard/iq/dataverse/datacite_metadata_template.xml
@@ -1,6 +1,6 @@
 
-
     ${identifier}
     ${creators}
diff --git a/src/main/webapp/403.xhtml b/src/main/webapp/403.xhtml
index bb6d6314752..6e076fa07d5 100644
--- a/src/main/webapp/403.xhtml
+++ b/src/main/webapp/403.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:o="http://omnifaces.org/ui"      
       xmlns:p="http://primefaces.org/ui">
-
     
     
 
diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml
index 488eb5cd322..97a61759d31 100644
--- a/src/main/webapp/404.xhtml
+++ b/src/main/webapp/404.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"      
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
diff --git a/src/main/webapp/500.xhtml b/src/main/webapp/500.xhtml
index f617691d65e..4ad48696234 100644
--- a/src/main/webapp/500.xhtml
+++ b/src/main/webapp/500.xhtml
@@ -4,7 +4,6 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui">
-
     
     
 
diff --git a/src/main/webapp/ThemeAndWidgets.xhtml b/src/main/webapp/ThemeAndWidgets.xhtml
index ead5ff31ca3..fd8d7c7cf12 100644
--- a/src/main/webapp/ThemeAndWidgets.xhtml
+++ b/src/main/webapp/ThemeAndWidgets.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
index 1d35ebb5867..ecd3ba15c40 100644
--- a/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -11,5 +11,6 @@
   
   
   
+  
   
 
diff --git a/src/main/webapp/WEB-INF/pretty-config.xml b/src/main/webapp/WEB-INF/pretty-config.xml
index f8954c970ea..e7c085fbc6e 100644
--- a/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/src/main/webapp/WEB-INF/pretty-config.xml
@@ -17,4 +17,9 @@
         
     
 
+    
+        
+        
+    
+
 
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 5ef5faf85f6..ff617a9fad0 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -22,6 +22,13 @@
         org.jboss.weld.context.conversation.lazy
         false
     
+    
+    
+        javax.faces.PROJECT_STAGE
+
+        Production
+    
     
         primefaces.THEME
         bootstrap
@@ -127,6 +134,8 @@
         
             1440
         
+        
+	
     
     
     
diff --git a/src/main/webapp/confirmemail.xhtml b/src/main/webapp/confirmemail.xhtml
index 06f23ed7c1f..1ac88a457c6 100644
--- a/src/main/webapp/confirmemail.xhtml
+++ b/src/main/webapp/confirmemail.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
       
 
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index 98e2b6abddf..bbac3e640f6 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-
     
     
 
diff --git a/src/main/webapp/dashboard.xhtml b/src/main/webapp/dashboard.xhtml
index e6144dc2f22..d43c591116f 100644
--- a/src/main/webapp/dashboard.xhtml
+++ b/src/main/webapp/dashboard.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-
     
     
 
@@ -64,7 +63,7 @@
                                             
        #{bundle['harvestserver.service.empty']}
        
                                         
                                         
        
-                                            
+                                            
                                             
        #{bundle['dashboard.card.harvestingserver.status']}
        
                                         
        
                                         
        
diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index c7ac9ba2403..6ad515f23c4 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -442,7 +442,7 @@
            
        
        
 
-       
        
+        
        
            
        
                #{bundle['file.dataFilesTab.terms.list.guestbook']}  
            
        
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index bdef7416845..c7f41c24e8a 100755
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -199,13 +199,11 @@
                                          #{bundle['dataset.editBtn']} 
                                     
                                     
        
@@ -577,7 +588,7 @@
                                         
                                     
                                     
        
-                                        
                                         
@@ -608,7 +619,7 @@
                                         
                                     
                                     
        
-                                        
+                                        
                                         
                                     
        
                                 
        
@@ -620,7 +631,7 @@
                                         
                                     
                                     
        
-                                        
+                                        
                                         
                                     
        
                                 
        
@@ -630,10 +641,10 @@
                                 
                                 
        
                                     
        
-                                        
-                                        
                                             
                                         
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index f0b51212f13..1a0da1f1150 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -20,8 +20,62 @@
         
      
         
      
             
      
+                
+                
+                    
      
+                        
+                            
+                            
+                        
+                        
+                        
+                    
      
+                      
                 
-                
+                
      
+                    
+                    
      
+                        
+                        
      
+                            
      
+                                
      
+                                    
+                                    
+                                        
+                                            
+                                                
+                                                
+                                                
+                                                
+                                                                            
+                                        
+                                    
+                                
      
+                            
      
+                            
      
+                                
      
+                                    
+                                    
+                                
      
+                            
      
+                            
      
+                                
      
+                                    
+                                    
+                                        
+                                    
+                                    
+                                        
+                                        
+                                    
+                                
      
+                    
                     
-                    
      
-                        
-                        
-                        
-                            
-                                              
-                          
-                        
-                        
-                            
-                            
-                                              
-                         
-                    
      
                      
                     
                      
@@ -181,16 +222,15 @@
                     
 
                     
-                    
-                    
      
-                        
      
-                            
      
                         
      
-                        
+                    
                     
      
                     
+                    
      
+                        
+                        
+                        
+                        
      
+                            
      
+                                
+                                    
+                                        
      
+                                             #{bundle['file.createUploadDisabled']}
+                                        
      
+                                          
+                                    
+                                        
      
+                                             #{bundle['file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp']}
+                                        
      
+                                          
+                                      
+                                 
+                                    
+                                    
+                                        
      
+                                            
+                                            
+                                                
+                                                
+                                            
+                                        
      
+                                        
        
+                                            
      1. 
+                                                
+                                            
        2. 
+                                            
      2. 
+                                                
+                                                
+                                                     
+                                                
+                                            
        3. 
+                                            
      3. 
+                                                
+                                                    
+                                                
+                                            
        4. 
+                                            
      4. 
+                                                
+                                            
        5. 
+                                        
      
+                                          
+                                    
+                                    
+                                        
      
+                                            
+                                            
+                                                
+                                                    
+                                                        
+                                                        
+                                                        
+                                                        
+                                                                                    
+                                                
+                                            
+                                        
      
+                                          
+                                    
+                                        
      
+                                            
+                                            
+                                        
      
+                                          
+                                    
+                                        
      
+                                            
+                                            
+                                        
      
+                                          
+                                    
+                                    
+                                        
      
+                                             #{bundle['file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp']}
+                                        
      
+                                          
+                                    
+                                    
+                                        
      
+                                            
+                                            
+                                                
+                                                    
+                                                        
+                                                        
+                                                        
+                                                        
+                                                                                    
+                                                
+                                            
+                                        
      
+                                          
+                                    
+                                    
+                                    
+                                        
      
+                                            
+                                            
+                                                
+                                                    
+                                                        
+                                                        
+                                                        
+                                                        
+                                                                                    
+                                                
+                                            
+                                        
      
+                                          
+                                      
+                            
      
+                        
      
+                    
                     
+                    
                     
                     
                     
      
+                
+                
+                
      
+                
+                
                 
                 
+                             emptyMessage="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}">
                     
                         
      
                             
@@ -239,7 +420,6 @@
                             
      
                         
      
                     
-                    
                     
                     
                         
      
@@ -252,7 +432,7 @@
                             
                             
                                 
-                                
+                                
                             
                             
                             
      
@@ -271,7 +451,9 @@
                             
-                            
+                            
+                            
+                            
                             
                         
                         
@@ -284,7 +466,6 @@
                             
      
                         
      
                         
-                        
                         
      
                             
                             
@@ -295,7 +476,9 @@
                                 
-                                
+                                 
+                                
+                                
                                 
                                 
                             
@@ -315,7 +498,7 @@
                     
                     
                         
-                            
      
+                            
      
                                 
@@ -422,13 +605,15 @@
                         
      
                     
                 
+                
+                
      
+                
             
      
         
      
     
      
     
-
+    
     
-    
 
     
     
@@ -441,13 +626,21 @@
         
      
     
     
+    
+        
       #{bundle['dataset.noSelectedFilesForDelete']}
      
+        
      
+            
+        
      
+          
+    
     
         
       #{bundle['file.deleteFileDialog.tip']}
      
         
             
       #{bundle['file.deleteFileDialog.failed.tip']}
      
               
         
      
-            
             
         
      
@@ -460,9 +653,16 @@
                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                     
                 
-                
      
-                    
+                
+                
      
+                    
                 
      
+                       
+                
+                
      
+                    
+                
      
+                       
             
      
             
      
                 
-                
      
-                    
+                
+                
      
+                    
+                
      
+                       
+                
+                
      
+                    
                 
      
+                      
             
      
         
      
         
      
-            
+            
+            
             
         
      
           
@@ -491,152 +699,152 @@
                     
       #{bundle['file.spss-savEncoding.title']}
      
                     
      
                     
-                        
-                            
-                                
+                            
+                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
                             
-                            
-                                
+                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
                             
-                            
-                                
+                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
-                                
                                 
                             
-                            
-                                
+                                
                                 
-                                
                                 
-                                
                                 
                             
                             
-                            
                             
                         
@@ -791,10 +999,16 @@
                 $('button[id$="compareVersions"]').trigger('click');
             }
         }
+        function deleteFinished() {
+            $('button[id$="updateEditDataFilesButtonsForDelete"]').trigger('click');
+            $('button[id$="allDeletesFinished"]').trigger('click');
+        }
         function checkFilesSelected() {
             var count = PF('filesTable').getSelectedRowsCount();
             if (count > 0) {
                 PF('deleteFileConfirmation').show();
+            } else {
+                PF('selectFilesForDeleteFragment').show();              
             }
         }
         function checkNewlyRestricted() {
@@ -824,4 +1038,4 @@
             Dropbox.choose(options);
         }
     
-
\ No newline at end of file
+
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index 61ce0ed5c1e..cfc1bfdea70 100755
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
     
     
 
@@ -20,6 +19,7 @@
             
             
             
+            
             
             
                 
@@ -31,63 +31,22 @@
                     
                     
-                    
                 
                 
                     
                     
-                        
-                            
-                        
                         
      
                             
-                            
      
-                                
      
-                                    
        
-                                    
-                                        
-                                            
-                                        
-                                        
-                                        
                        
-                                            
-                                        
      
-                                        
      
-                                            
-                                        
      
-                                    
      
-                                
        
-                                
      
-                                    
      
-                                        #{fileToReplace.fileMetadata.label}
-                                    
      
-                                    
      
-                                        #{fileToReplace.friendlyType}
-                                         - #{fileToReplace.filesize} KB
-                                         - #{fileToReplace.fileMetadata.getFileDateToDisplay()}
-                                        
      #{fileToReplace.checksumType}: #{fileToReplace.checksumValue}
      
-                                    
      
-                                    
      
-                                        
-                                    
      
-
-                                    
      
-                                        
-                                            
-                                                
-                                             
-                                        
-                                        
-                                            
-                                                
-                                            
-                                        
-                                    
      
-                                
      
+                            
      
+                                
+                                    
+                                        
+                                    
+                                
                             
      
                         
      
                     
@@ -95,21 +54,38 @@
 
                     
      
 
-                        
-
+                    
+                        
+                        
+                        
+                        
+                        
+                        
                     
      
 
                     
-                    
      
-                        
-                        
-                        
-                        
      
+                    
+                        
      
+                            
+                                
      
+                                    
+                                    
+                                    
+                                    
      
+                                
      
+                                    
+                                    
+
+                                
      
+                                   
+                        
      
+                          
+
                     
 
                 
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index a08acdf74e8..f8f7f50a532 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -112,8 +112,34 @@
      
          #{bundle['file.compute']}
     
-               
-    
+        
+        
+        
+        
+         #{bundle.download}
+    
+
+    
+         
+        
+        
+         #{bundle.download}
+    
+
+     #{bundle.download}
     
 
-    
                             
                                 
@@ -146,9 +146,11 @@
             
         
      
         
      
+            
             
@@ -172,7 +174,15 @@
                            update="guestbookUIFragment">
                 #{bundle['acceptTerms']}
                 
+                
+            
+            
+                 
+                  
+                #{bundle['acceptTerms']}
             
+            
             
         
      
 
\ No newline at end of file
diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
new file mode 100644
index 00000000000..2add73eab3a
--- /dev/null
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -0,0 +1,60 @@
+
+    
+        
      
+            
      
+                
        
+                    
+                    
+                        
+                    
+                    
+                    
                        
+                        
+                    
      
+                    
      
+                        
+                    
      
+                
      
+            
      
+            
      
+                
      
+                    #{fileMetadata.label}
+                
      
+                
      
+                    #{fileMetadata.dataFile.friendlyType}
+                     - #{fileMetadata.dataFile.friendlySize}
+                     - #{fileMetadata.fileDateToDisplay}
+                    
      #{fileMetadata.dataFile.checksumType}: #{fileMetadata.dataFile.checksumValue}
      
+                
      
+                
      
+                    
+                
      
+
+                
      
+                    
+                        
+                            
+                         
+                    
+                    
+                        
+                            
+                        
+                    
+                
      
+            
      
+        
      
+          
+      
\ No newline at end of file
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 7a473546c30..5ebee260a3f 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -30,7 +30,7 @@
                     
      
                         
      
                             
-                            
      
+                            
      
                                 
      
                                      #{bundle['metrics.title']}
                                 
      
@@ -125,14 +125,14 @@
                                                 
                                             
                                             
-                                                
+                                                
                                                     
    1. 
                                                         
                                                             
                                                         
                                                     
      2. 
                                                       
-                                                
+                                                
                                                     
    2. 
                                                         
                                                             
@@ -140,26 +140,27 @@
                                                     
      3. 
                                                            
                                                   
-                                                                                    
+                                                                                    
                                             
    3. 
                                                 
                                                      
                                                 
                                             
      4. 
                                                   
-                                                                                    
+                                                                                    
                                             
    4. 
                                                 
                                                     
                                                 
                                             
      5. 
-                                                                                        
-                                            
    5. 
-                                                
-                                                    
-                                                
-                                            
      6. 
-
+                                                    
+                                             
+                                                
    6. 
+                                                    
+                                                        
+                                                    
+                                                
      7. 
+                                                  
                                             
                                             
    7. 
                                             
      8. 
@@ -172,7 +173,8 @@
                                 
                                 
      
+                                                                                             and (!FilePage.fileMetadata.dataFile.filePackage or
+                                                                                                   FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
                                     
                                         
                                         
@@ -361,7 +363,8 @@
                         
                             
                             
+                                   rendered="#{settingsWrapper.rsyncDownload and FilePage.fileMetadata.dataFile.filePackage and systemConfig.rsyncDownload
+                                        and !FilePage.fileMetadata.getDataFile().getOwner().getStorageIdentifier().startsWith('s3://') }">
                                 
                                     
                                     
@@ -424,12 +427,19 @@
                                                 
      
                                             
      
                                             
-                                            
      
+                                            
      
                                                 
                                                 
      
-                                                    
+                                                    
      
+                                                        
+                                                        
+                                                            
+                                                            
+                                                        
+                                                    
      
+                                                    
                                                 
      
                                             
      
                                             
      
@@ -550,6 +560,16 @@
                              
                         
      
                     
+                    
+                         
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                    
                     
                     
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index ec6694d5df5..034b0911810 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -22,11 +22,7 @@
                  rowIndexVar="rowNum" rowKey="#{fileMetadata.dataFile.storageIdentifier}"
                  selection="#{DatasetPage.selectedFiles}" var="fileMetadata" widgetVar="filesTable"
                  rendered="#{empty DatasetPage.editMode and (DatasetPage.workingVersion != null)}"
-                 emptyMessage="#{bundle['file.notFound.tip']}"
-                 >
-        
-        
-        
+                 emptyMessage="#{bundle['file.notFound.tip']}">
         
          
         
@@ -97,41 +93,40 @@
             
      
                 
      
                     
-                    
-                    
+                    
                         
                         
                         
                     
                 
      
 
-                
      
+                
      
+                    
                     
                     
-                    
      
-                        
-                            
-                             
-                        
+                        
+                        
+                        
+                             
+                        
+                        
+                        
                         
-                            
+                                                                                    and !widgetWrapper.widgetView}">
                              
                         
                     
      
+                         
                 
      
             
      
             
@@ -151,18 +146,20 @@
                          
                         
                     
      
+                    
      
+
                 
      
-            
      
         
         
         
+        
         
             
      
                 
                 
                     
-                      
+                      
                 
 
                 
@@ -171,7 +168,7 @@
                 
                 
                     
-                    
+                    
                 
 
                 
@@ -206,7 +203,7 @@
 
                 
 
-                
+                
                     
                 
 
@@ -238,7 +235,8 @@
                 
             
      
               
-        
+
+        
             
                 
                 
       #{bundle['file.editFiles']} 
                     
                     
      
-
                 
      
+            
      
                 
                     
                     
@@ -391,8 +392,9 @@
                     
                 
             
      
-            
-            
      
+            
      
                 
                 
                     
@@ -401,5 +403,5 @@
                 
             
      
         
-        
+    
 
diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml
index 29dfbc8a950..c72ca35055d 100644
--- a/src/main/webapp/guestbook-responses.xhtml
+++ b/src/main/webapp/guestbook-responses.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
@@ -81,10 +80,10 @@
                         
                             #{response[3]}
                         
-                        
+                        
                             
                         
-                        
+                        
                             #{customQResponse[0]}: #{customQResponse[1]} 

      
                                
                     
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index 214d324444b..5c05d714cbc 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index e2624f20c65..3cc8c196bef 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-
     
     
 
@@ -140,6 +139,11 @@
                                     
                                 
      
                             
      
+                            
                               
                     
 
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index a7a0270d3ae..fc7c91a1ef1 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-
     
     
 
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index d720db3877c..316e46b8570 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:fn="http://java.sun.com/jsp/jstl/functions"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
@@ -63,7 +62,7 @@
                                     
                                         
      
                                             
                                             
      
                                                 
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index a9f1a157c1c..7090fdeca52 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -13,7 +13,7 @@
                    var="metadataBlockVal" varStatus="block">
             
      
                 
      
-                    #{metadataBlockVal.key.displayName}  
+                    #{metadataBlockVal.key.localeDisplayName}  
                 
      
                 
      
                     
      
@@ -54,8 +54,8 @@
                         
                             
      
                                 
                                 
@@ -93,6 +93,7 @@
     
      
     
     
+        
         
         
      
             
@@ -100,7 +101,7 @@
                                                                  or metadataBlockVal.key.isHasRequired())
                                                                  or (!datasetPage)}">
                     
      
-                        #{metadataBlockVal.key.displayName} 
+                        #{metadataBlockVal.key.localeDisplayName} 
                     
      
                     
      
                         
      
@@ -110,13 +111,14 @@
                                                          or (!datasetPage and dsf.include)}">
                                     
      
                                         
                                         
-                                        
+                                        
+                                            
                                             
      
                                                 
-                                        
+                                        
+                                            
                                             
      
                                                 
                                                     
      
@@ -188,7 +193,7 @@
                                                                     
      
                                                                 
                                                                 
                                                                 
@@ -202,12 +207,12 @@
                                                                     
                                                                         
-                                                                        
+                                                                        
                                                                     
                                                                     
      
                                                                         
-                                                                            
+                                                                            
                                                                         
                                                                     
      
                                                                     
      
@@ -220,7 +225,8 @@
                                                     
      
                                                         
                                                             
                                                         
@@ -228,6 +234,7 @@
                                                                        styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
                                                                        rendered="#{dsf.datasetFieldCompoundValues.size() > 1}"
                                                                        actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
+                                                                       update=":#{p:resolveClientIds('@id(editMetadataFragement)', view)}"
                                                                        oncomplete="javascript:bind_bsui_components();">
                                                             
                                                         
@@ -243,5 +250,6 @@
                 
      
             
         
      
+        
           
 
\ No newline at end of file
diff --git a/src/main/webapp/mydata_fragment.xhtml b/src/main/webapp/mydata_fragment.xhtml
index 731339476f6..c91acd1f3af 100644
--- a/src/main/webapp/mydata_fragment.xhtml
+++ b/src/main/webapp/mydata_fragment.xhtml
@@ -70,7 +70,7 @@
                      
      
                             
                         
                     
                         
                 
diff --git a/src/main/webapp/oauth2/callback.xhtml b/src/main/webapp/oauth2/callback.xhtml
index 6ae50318e6c..f0d66b2fa74 100644
--- a/src/main/webapp/oauth2/callback.xhtml
+++ b/src/main/webapp/oauth2/callback.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
diff --git a/src/main/webapp/oauth2/convert.xhtml b/src/main/webapp/oauth2/convert.xhtml
index 9b6a2add03d..108f170918a 100644
--- a/src/main/webapp/oauth2/convert.xhtml
+++ b/src/main/webapp/oauth2/convert.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
-
     
 
     
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index b7a549dd273..78b9d15d618 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
-
     
 
     
diff --git a/src/main/webapp/package-download-popup-fragment.xhtml b/src/main/webapp/package-download-popup-fragment.xhtml
new file mode 100644
index 00000000000..e1e229d5113
--- /dev/null
+++ b/src/main/webapp/package-download-popup-fragment.xhtml
@@ -0,0 +1,35 @@
+
+
+    
+    
      
+        
      
+            
       
+                                                            
+                
+                    
+                    
+                
+            
      
+        
      
+        
      
+            
+                
+            
+        
      
+        
      
+             
+            
      #{systemConfig.getDataverseSiteUrl()}/api/access/datafile/#{packagePopupFragmentBean.fileMetadata.dataFile.id}
      
+        
      
+        
                    
+            
+        
      
+    
      
+      
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 97ce2c8854f..71dcbb3968d 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
diff --git a/src/main/webapp/permissions-configure.xhtml b/src/main/webapp/permissions-configure.xhtml
index 53c3b82507f..3e8f55ba0a6 100644
--- a/src/main/webapp/permissions-configure.xhtml
+++ b/src/main/webapp/permissions-configure.xhtml
@@ -25,9 +25,10 @@
             #{bundle['dataverse.permissions.Q2']}
         
         
      
-            
-                
-                
+            
+                 
+                 
+                 #{managePermissionsPage.customDefaultContributorRoleAlias}               
             
             
      
                 
             
      
             
      
-                
      
-        
      
+            
+            
      
+                
+            
      
+                  
+        
                    
     
          
 
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index 392690532fb..3f1506136f1 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://java.sun.com/jsp/jstl/core"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
     
     
 
@@ -74,6 +73,9 @@
                                                             
                                                                 #{bundle.curator} #{bundle['dataverse.permissions.Q2.answer.curator.description']}
                                                             
+                                                            
+                                                                #{managePermissionsPage.customDefaultContributorRoleName} #{managePermissionsPage.customDefaultContributorRoleDescription}
+                                                            
                                                         
      
                                                     
      
                                                 
      
@@ -185,7 +187,7 @@
                                                                update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}">
                                                 
      
                                                     
-                                                        #{prm}
+                                                        #{bundle['permission.'.concat(prm).concat('.label')]}
                                                     
                                                 
      
                                             
      
diff --git a/src/main/webapp/privateurl.xhtml b/src/main/webapp/privateurl.xhtml
index e2319053f99..7da9a9cf882 100644
--- a/src/main/webapp/privateurl.xhtml
+++ b/src/main/webapp/privateurl.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-
     
     
 
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index f3a16db494d..3d95f5c15b6 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -24,7 +24,6 @@ body .ui-widget {font-size: inherit;}
 #navbarFixed .navbar-brand {color:#C55B28; padding-left:32px;}
 #navbarFixed .navbar-brand.custom-logo {height:auto; padding:0;}
 #navbarFixed .icon-dataverse {color:#C55B28; font-size:28px; margin: -4px 0 0 -27px; position: absolute;}
-#navbarFixed .label.status {display:block; float:left; margin-top:16px; background:#C55B28; font-size:14px; font-weight:normal;}
 
 #navbarFixed .dropdown.accountName a:focus {outline: -webkit-focus-ring-color 5px auto;}
 #navbarFixed form.navbar-form.navbar-form-link {margin:0; padding:0;}
@@ -38,6 +37,9 @@ body .ui-widget {font-size: inherit;}
 #navbarFixed .dropdown.accountName .logout a {clear: both; color: #333333; display: block; font-weight: normal; line-height: 1.42857; padding: 3px 20px; white-space: nowrap; text-decoration: none;}
 #navbarFixed li.dropdown.open > span.dropdown-toggle {background-color: #e7e7e7;}
 
+#status-alert {margin-top:0; margin-bottom:0;}
+#status-alert div.alert {border:0; box-shadow:none;}
+
 #footer {margin-top:3em; padding-bottom:4em; color:#808080;}
 #footer.widget-view {position:fixed; left:0px; bottom:0px; margin:0; padding:4px 0 0 0; min-height:44px; width:100%; background:#fff;}
 #footer .poweredbylogo {text-align:right;}
@@ -680,13 +682,15 @@ span.text-info.popoverHTML {display:inline-block;}
 /*div[id$="versionsTable"] .ui-datatable-tablewrapper thead {display:none;}*/
 div[id$="versionsTable"] th.col-select-width * {display:none;}
 
+div[id$="filesTable"].ui-datatable.ui-widget div.ui-datatable-tablewrapper {overflow:visible;}
+
 div[id$="filesTable"].ui-datatable.ui-widget {margin-bottom:20px;}
 div[id$="filesTable"].ui-datatable.ui-widget table {table-layout: fixed;}
 div[id$="filesTable"].ui-datatable.ui-widget table th,
 div[id$="filesTable"].ui-datatable.ui-widget table td {box-sizing: content-box;}
 div[id$="filesTable"] div.ui-datatable-header.ui-widget-header {padding:0; background:none; border:0;}
-div[id$="filesTable"] #filesHeaderCount {padding:10px 10px 4px 10px;}
-div[id$="filesTable"] #filesHeaderCount span.highlightBold {display:block; padding:0; line-height:1.65;}
+div[id$="filesHeaderCount"] {padding:6px 12px;}
+div[id$="filesHeaderCount"] span.highlightBold {display:block; padding:0; line-height:1.65;}
 div[id$="filesTable"] .col-file-thumb {border-right:0;}
 div[id$="filesTable"] .col-file-thumb div.thumbnail-block {position:relative;width:64px;height:64px;margin:0 auto;}
 div[id$="filesTable"] .col-file-thumb div.thumbnail-block span.file-thumbnail-icon {font-size:62px;line-height:1.05;}
diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index 8d1c4ab584a..fba070e9cf3 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -104,8 +104,8 @@ function show_info_msg(mtitle, mtext){
  * Called after "Edit Dataverse" - "General Information"
  */
 function post_edit_dv_general_info(){
-    show_info_msg('Edit Dataverse', 'Edit your dataverse and click Save Changes. Asterisks indicate required fields.');
-    hide_search_panels();
+    // show_info_msg('Edit Dataverse', 'Edit your dataverse and click Save Changes. Asterisks indicate required fields.');
+    // hide_search_panels();
     bind_bsui_components();
 }
 
@@ -113,36 +113,37 @@ function post_edit_dv_general_info(){
  * Used after cancelling "Edit Dataverse"
  */
 function post_cancel_edit_dv(){
-   show_search_panels()
-   hide_info_msg();
+   // show_search_panels()
+   // hide_info_msg();
    bind_bsui_components();
    initCarousel();
 }
 
 /*
  * Hide search panels when editing a dv
+ * NO LONGER IN USE, INSTEAD ADDED p:fragment TO DV PG
  */
-function hide_search_panels(){
-    if($(".panelSearchForm").length>0){
-       $(".panelSearchForm").hide();
-        if($(".panelSearchForm").next().length>0){
-            $(".panelSearchForm").next().hide();
-        }
-   }
-}
+//function hide_search_panels(){
+//    if($(".panelSearchForm").length>0){
+//       $(".panelSearchForm").hide();
+//        if($(".panelSearchForm").next().length>0){
+//            $(".panelSearchForm").next().hide();
+//        }
+//   }
+//}
 
 /*
  * Show search panels when cancel a dv edit
+ * NO LONGER IN USE, INSTEAD ADDED p:fragment TO DV PG
  */
-
-function show_search_panels(){
-    if($(".panelSearchForm").length>0){
-        if($(".panelSearchForm").next().length>0){
-            $(".panelSearchForm").next().show();
-        }
-       $(".panelSearchForm").show();
-   }
-}
+//function show_search_panels(){
+//    if($(".panelSearchForm").length>0){
+//        if($(".panelSearchForm").next().length>0){
+//            $(".panelSearchForm").next().show();
+//        }
+//       $(".panelSearchForm").show();
+//   }
+//}
 
 
 /*
diff --git a/src/main/webapp/role_permission_helper.xhtml b/src/main/webapp/role_permission_helper.xhtml
index 8f6ba24894d..c28813a060d 100644
--- a/src/main/webapp/role_permission_helper.xhtml
+++ b/src/main/webapp/role_permission_helper.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-
   
-
   
 
   
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml
index 7b4c6ab52a8..94fea252cda 100644
--- a/src/main/webapp/roles-assign.xhtml
+++ b/src/main/webapp/roles-assign.xhtml
@@ -71,7 +71,7 @@
                                         
      #{managePermissionsPage.assignedRole.description}
      
                                         
      
                                             
-                                                #{prm}
+                                                #{bundle['permission.'.concat(prm).concat('.label')]}
                                             
                                         
      
                                         
      
diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml
index 9c9c2dc7da5..d7d0f9f53bf 100644
--- a/src/main/webapp/roles-edit.xhtml
+++ b/src/main/webapp/roles-edit.xhtml
@@ -60,7 +60,7 @@
                 
                     
                 
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index ac31634ed73..4d9e94f899a 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -450,9 +450,9 @@
                             
                             
                             
-                            
+                            
                             
-                            
+                            
                         
      
                         
      
                             
@@ -506,10 +506,10 @@
                                 
                                 
 
-                            
-                            
-                            
-                            
+                            
+                            
+                            
+                            
                             
                         
      
                         
      
@@ -572,9 +572,9 @@
                                 
                                 
                                 
-                            
-                            
-                            
+                            
+                            
+                            
                             
                         
      
 
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index b462e07e47d..305785ac11d 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
@@ -43,6 +42,16 @@
                                         
                                     
      
                                 
      
+                                
      
+                                    
+                                    
      
+                                        
+                                    
      
+                                
      
                                 
      
                                     
      
@@ -84,13 +93,13 @@
                         
                             
      
                                 
      
-                                      
+                                      
                                 
      
                                 
      
                                     
                                         
      
                                             
@@ -99,7 +108,7 @@
                                                 
      
                                                     
                                                         
+                                                                       itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>
                                                     
                                                 
      
                                             
      
diff --git a/src/main/webapp/shib.xhtml b/src/main/webapp/shib.xhtml
index a9c8ba64937..4d149cdbf02 100644
--- a/src/main/webapp/shib.xhtml
+++ b/src/main/webapp/shib.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-
     
     
 
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 25a8668935f..49f66d8a545 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-    
     
     
 
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 315ae30376e..b1931ae7e5a 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -7,7 +7,8 @@
     
         
             
-                
+                
+                    
                     
                     
      
                         
      
diff --git a/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java b/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
new file mode 100644
index 00000000000..4d146080594
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DataCitationTest.java
@@ -0,0 +1,382 @@
+package edu.harvard.iq.dataverse;
+
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static junit.framework.TestCase.assertNull;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Testing DataCitation class
+ * @author pkiraly@gwdg.de
+ */
+public class DataCitationTest {
+
+    /**
+     * Test the public properties of DataCitation class via their getters
+     * @throws ParseException
+     */
+    @Test
+    public void testProperties() throws ParseException {
+        DataCitation dataCitation = new DataCitation(createATestDatasetVersion(true, true));
+        assertEquals("First Last", dataCitation.getAuthorsString());
+        assertNull(dataCitation.getFileTitle());
+        assertEquals("doi:10.5072/FK2/LK0D1H", dataCitation.getPersistentId().asString());
+        assertEquals("LibraScholar", dataCitation.getPublisher());
+        assertEquals("Dataset Title", dataCitation.getTitle());
+        assertNull(dataCitation.getUNF());
+        assertEquals("V1", dataCitation.getVersion());
+        assertEquals("1955", dataCitation.getYear());
+    }
+
+    /**
+     * Test DataCite metadata
+     * @throws ParseException
+     */
+    @Test
+    public void testGetDataCiteMetadata() throws ParseException {
+        DataCitation dataCitation = new DataCitation(createATestDatasetVersion(true, true));
+        Map properties = dataCitation.getDataCiteMetadata();
+        assertEquals(4, properties.size());
+        assertEquals(
+           "datacite.creator, datacite.publisher, datacite.title, datacite.publicationyear",
+           StringUtils.join(properties.keySet(), ", ")
+        );
+        assertEquals("First Last", properties.get("datacite.creator"));
+        assertEquals("LibraScholar", properties.get("datacite.publisher"));
+        assertEquals("Dataset Title", properties.get("datacite.title"));
+        assertEquals("1955", properties.get("datacite.publicationyear"));
+    }
+
+    /**
+     * Test that bibtex data export contains a closing bracket
+     * @throws ParseException
+     * @throws IOException
+     */
+    @Test
+    public void testWriteAsBibtexCitation() throws ParseException, IOException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, true);
+
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        dataCitation.writeAsBibtexCitation(os);
+        String out = new String(os.toByteArray(), "UTF-8");
+        assertEquals(
+                "@data{LK0D1H_1955,\r\n"
+                + "author = {First Last},\r\n"
+                + "publisher = {LibraScholar},\r\n"
+                + "title = {Dataset Title},\r\n"
+                + "year = {1955},\r\n"
+                + "version = {V1},\r\n"
+                + "doi = {10.5072/FK2/LK0D1H},\r\n"
+                + "url = {https://doi.org/10.5072/FK2/LK0D1H}\r\n"
+                + "}\r\n",
+                out
+        );
+    }
+
+    /**
+     * Test that bibtex data export contains a closing bracket
+     *
+     * @throws ParseException
+     */
+    @Test
+    public void testToBibtexString() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, true);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+                "@data{LK0D1H_1955,\r\n"
+                + "author = {First Last},\r\n"
+                + "publisher = {LibraScholar},\r\n"
+                + "title = {Dataset Title},\r\n"
+                + "year = {1955},\r\n"
+                + "version = {V1},\r\n"
+                + "doi = {10.5072/FK2/LK0D1H},\r\n"
+                + "url = {https://doi.org/10.5072/FK2/LK0D1H}\r\n"
+                + "}\r\n",
+                dataCitation.toBibtexString()
+        );
+    }
+
+    /**
+     * Test that bibtex data export contains an empty author if no author is
+     * specified
+     *
+     * @throws ParseException
+     */
+    @Test
+    public void testToBibtexString_withoutAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, false);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+                "@data{LK0D1H_1955,\r\n"
+                + "author = {},\r\n"
+                + "publisher = {LibraScholar},\r\n"
+                + "title = {Dataset Title},\r\n"
+                + "year = {1955},\r\n"
+                + "version = {V1},\r\n"
+                + "doi = {10.5072/FK2/LK0D1H},\r\n"
+                + "url = {https://doi.org/10.5072/FK2/LK0D1H}\r\n"
+                + "}\r\n",
+                dataCitation.toBibtexString()
+        );
+    }
+
+    /**
+     * Test that bibtex data export contains an empty title if no title is
+     * specified
+     *
+     * @throws ParseException
+     */
+    @Test
+    public void testToBibtexString_withoutTitle() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(false, true);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+                "@data{LK0D1H_1955,\r\n"
+                + "author = {First Last},\r\n"
+                + "publisher = {LibraScholar},\r\n"
+                + "title = {},\r\n"
+                + "year = {1955},\r\n"
+                + "version = {V1},\r\n"
+                + "doi = {10.5072/FK2/LK0D1H},\r\n"
+                + "url = {https://doi.org/10.5072/FK2/LK0D1H}\r\n"
+                + "}\r\n",
+                dataCitation.toBibtexString()
+        );
+    }
+
+    /**
+     * Test that bibtex data export contains an empty author and title if no
+     * author, nor title is specified
+     *
+     * @throws ParseException
+     */
+    @Test
+    public void testToBibtexString_withoutTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(false, false);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+                "@data{LK0D1H_1955,\r\n"
+                + "author = {},\r\n"
+                + "publisher = {LibraScholar},\r\n"
+                + "title = {},\r\n"
+                + "year = {1955},\r\n"
+                + "version = {V1},\r\n"
+                + "doi = {10.5072/FK2/LK0D1H},\r\n"
+                + "url = {https://doi.org/10.5072/FK2/LK0D1H}\r\n"
+                + "}\r\n",
+                dataCitation.toBibtexString()
+        );
+    }
+
+    @Test
+    public void testToRISString_withTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, true);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "Provider: LibraScholar\r\n" +
+           "Content: text/plain; charset=\"utf-8\"\r\n" +
+           "TY  - DATA\r\n" +
+           "T1  - Dataset Title\r\n" +
+           "AU  - First Last\r\n" +
+           "DO  - doi:10.5072/FK2/LK0D1H\r\n" +
+           "ET  - V1\r\n" +
+           "PY  - 1955\r\n" +
+           "SE  - 1955-11-05 00:00:00.0\r\n" +
+           "UR  - https://doi.org/10.5072/FK2/LK0D1H\r\n" +
+           "PB  - LibraScholar\r\n" +
+           "ER  - \r\n",
+           dataCitation.toRISString()
+        );
+    }
+
+    @Test
+    public void testToRISString_withoutTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(false, false);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "Provider: LibraScholar\r\n" +
+           "Content: text/plain; charset=\"utf-8\"\r\n" +
+           "TY  - DATA\r\n" +
+           "T1  - \r\n" +
+           "DO  - doi:10.5072/FK2/LK0D1H\r\n" +
+           "ET  - V1\r\n" +
+           "PY  - 1955\r\n" +
+           "SE  - 1955-11-05 00:00:00.0\r\n" +
+           "UR  - https://doi.org/10.5072/FK2/LK0D1H\r\n" +
+           "PB  - LibraScholar\r\n" +
+           "ER  - \r\n",
+           dataCitation.toRISString()
+        );
+    }
+
+    @Test
+    public void testToEndNoteString_withTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, true);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "" +
+           "" +
+           "" +
+           "" +
+           "59" +
+           "" +
+           "First Last" +
+           "" +
+           "Dataset Title" +
+           "
      1955-11-05
      " +
+           "1955" +
+           "V1" +
+           "LibraScholar" +
+           "https://doi.org/10.5072/FK2/LK0D1H" +
+           "doi/10.5072/FK2/LK0D1H" +
+           "      " +
+           "      " +
+           "      ",
+           dataCitation.toEndNoteString()
+        );
+    }
+
+    @Test
+    public void testToEndNoteString_withoutTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(false, false);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "" +
+           "" +
+           "" +
+           "" +
+           "59" +
+           "" +
+           "" +
+           "
      1955-11-05
      " +
+           "1955" +
+           "V1" +
+           "LibraScholar" +
+           "https://doi.org/10.5072/FK2/LK0D1H" +
+           "doi/10.5072/FK2/LK0D1H" +
+           "      " +
+           "      " +
+           "      ",
+           dataCitation.toEndNoteString()
+        );
+    }
+
+    @Test
+    public void testToString_withTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, true);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "First Last, 1955, \"Dataset Title\", https://doi.org/10.5072/FK2/LK0D1H, LibraScholar, V1",
+           dataCitation.toString()
+        );
+    }
+
+    @Test
+    public void testToString_withoutTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(false, false);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "1955, https://doi.org/10.5072/FK2/LK0D1H, LibraScholar, V1",
+           dataCitation.toString()
+        );
+    }
+
+    @Test
+    public void testToHtmlString_withTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(true, true);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "First Last, 1955, \"Dataset Title\"," +
+           " https://doi.org/10.5072/FK2/LK0D1H," +
+           " LibraScholar, V1",
+           dataCitation.toString(true)
+        );
+    }
+
+    @Test
+    public void testToHtmlString_withoutTitleAndAuthor() throws ParseException {
+        DatasetVersion datasetVersion = createATestDatasetVersion(false, false);
+        DataCitation dataCitation = new DataCitation(datasetVersion);
+        assertEquals(
+           "1955," +
+           " https://doi.org/10.5072/FK2/LK0D1H," +
+           " LibraScholar, V1",
+           dataCitation.toString(true)
+        );
+    }
+
+    private DatasetVersion createATestDatasetVersion(boolean withTitle, boolean withAuthor) throws ParseException {
+        Dataverse dataverse = new Dataverse();
+        dataverse.setName("LibraScholar");
+
+        Dataset dataset = new Dataset();
+        dataset.setProtocol("doi");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("LK0D1H");
+        dataset.setOwner(dataverse);
+
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setDataset(dataset);
+        datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+        datasetVersion.setVersionNumber(1L);
+
+        List fields = new ArrayList<>();
+        if (withTitle) {
+            fields.add(createTitleField("Dataset Title"));
+        }
+        if (withAuthor) {
+            fields.add(createAuthorField("First Last"));
+        }
+
+        if (!fields.isEmpty()) {
+            datasetVersion.setDatasetFields(fields);
+        }
+
+        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
+        Date publicationDate = dateFmt.parse("19551105");
+
+        datasetVersion.setReleaseTime(publicationDate);
+
+        dataset.setPublicationDate(new Timestamp(publicationDate.getTime()));
+
+        return datasetVersion;
+    }
+
+    private DatasetField createAuthorField(String value) {
+        DatasetField author = new DatasetField();
+        author.setDatasetFieldType(new DatasetFieldType(DatasetFieldConstant.author, DatasetFieldType.FieldType.TEXT, false));
+        List compoundValues = new LinkedList<>();
+        DatasetFieldCompoundValue compoundValue = new DatasetFieldCompoundValue();
+        compoundValue.setParentDatasetField(author);
+        compoundValue.setChildDatasetFields(Arrays.asList(
+           constructPrimitive(DatasetFieldConstant.authorName, value)
+        ));
+        compoundValues.add(compoundValue);
+        author.setDatasetFieldCompoundValues(compoundValues);
+        return author;
+    }
+
+    private DatasetField createTitleField(String value) {
+        return constructPrimitive(DatasetFieldConstant.title, value);
+    }
+
+    DatasetField constructPrimitive(String fieldName, String value) {
+        DatasetField field = new DatasetField();
+        field.setDatasetFieldType(
+           new DatasetFieldType(fieldName, DatasetFieldType.FieldType.TEXT, false));
+        field.setDatasetFieldValues(
+           Collections.singletonList(
+              new DatasetFieldValue(field, value)));
+        return field;
+    }
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java
new file mode 100644
index 00000000000..a9e41659140
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetAuthorTest.java
@@ -0,0 +1,60 @@
+package edu.harvard.iq.dataverse;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class DatasetAuthorTest {
+
+    @Test
+    public void testGetIdentifierAsUrlOrcid() {
+        DatasetAuthor datasetAuthor = new DatasetAuthor();
+        datasetAuthor.setIdType("ORCID");
+        datasetAuthor.setIdValue("0000-0002-1825-0097");
+        String result = datasetAuthor.getIdentifierAsUrl();
+        assertEquals("https://orcid.org/0000-0002-1825-0097", result);
+    }
+
+    @Test
+    public void testGetIdentifierAsUrlIsni() {
+        DatasetAuthor datasetAuthor = new DatasetAuthor();
+        datasetAuthor.setIdType("ISNI");
+        datasetAuthor.setIdValue("0000000121032683");
+        String result = datasetAuthor.getIdentifierAsUrl();
+        assertEquals("http://www.isni.org/isni/0000000121032683", result);
+    }
+
+    @Test
+    public void testGetIdentifierAsUrlLcna() {
+        DatasetAuthor datasetAuthor = new DatasetAuthor();
+        datasetAuthor.setIdType("LCNA");
+        datasetAuthor.setIdValue("n82058243");
+        String result = datasetAuthor.getIdentifierAsUrl();
+        assertEquals("http://id.loc.gov/authorities/names/n82058243", result);
+    }
+
+    @Test
+    public void testGetIdentifierAsUrlViaf() {
+        DatasetAuthor datasetAuthor = new DatasetAuthor();
+        datasetAuthor.setIdType("VIAF");
+        datasetAuthor.setIdValue("172389567");
+        String result = datasetAuthor.getIdentifierAsUrl();
+        assertEquals("https://viaf.org/viaf/172389567", result);
+    }
+
+    @Test
+    public void testGetIdentifierAsUrlGnd() {
+        DatasetAuthor datasetAuthor = new DatasetAuthor();
+        datasetAuthor.setIdType("GND");
+        datasetAuthor.setIdValue("4079154-3");
+        String result = datasetAuthor.getIdentifierAsUrl();
+        assertEquals("https://d-nb.info/gnd/4079154-3", result);
+    }
+
+    @Test
+    public void testGetIdentifierAsUrlNull() {
+        DatasetAuthor datasetAuthor = new DatasetAuthor();
+        String result = datasetAuthor.getIdentifierAsUrl();
+        assertEquals(null, result);
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java
index aeceedc07f6..dedafe7722e 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetFieldValueValidatorTest.java
@@ -5,6 +5,7 @@
  */
 package edu.harvard.iq.dataverse;
 
+import java.util.regex.Pattern;
 import javax.validation.ConstraintValidatorContext;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -136,5 +137,51 @@ public void testIsValid() {
         assertEquals(false, result);
         
     }
-    
+
+    @Test
+    public void testIsValidAuthorIdentifierOrcid() {
+        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
+        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_ORCID);
+        assertTrue(validator.isValidAuthorIdentifier("0000-0002-1825-0097", pattern));
+        // An "X" at the end of an ORCID is less common but still valid.
+        assertTrue(validator.isValidAuthorIdentifier("0000-0002-1694-233X", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("0000 0002 1825 0097", pattern));
+        assertFalse(validator.isValidAuthorIdentifier(" 0000-0002-1825-0097", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("0000-0002-1825-0097 ", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    }
+
+    @Test
+    public void testIsValidAuthorIdentifierIsni() {
+        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
+        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_ISNI);
+        assertTrue(validator.isValidAuthorIdentifier("0000000121032683", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    }
+
+    @Test
+    public void testIsValidAuthorIdentifierLcna() {
+        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
+        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_LCNA);
+        assertTrue(validator.isValidAuthorIdentifier("n82058243", pattern));
+        assertTrue(validator.isValidAuthorIdentifier("foobar123", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    }
+
+    @Test
+    public void testIsValidAuthorIdentifierViaf() {
+        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
+        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_VIAF);
+        assertTrue(validator.isValidAuthorIdentifier("172389567", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    }
+
+    @Test
+    public void testIsValidAuthorIdentifierGnd() {
+        DatasetFieldValueValidator validator = new DatasetFieldValueValidator();
+        Pattern pattern = DatasetAuthor.getValidPattern(DatasetAuthor.REGEX_GND);
+        assertTrue(validator.isValidAuthorIdentifier("4079154-3", pattern));
+        assertFalse(validator.isValidAuthorIdentifier("junk", pattern));
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
index 500b30b2062..3ca69fa71d2 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import java.io.StringReader;
 import java.sql.Timestamp;
 import java.text.ParseException;
@@ -94,6 +95,9 @@ public void testIsInReview() {
         assertFalse(nonDraft.isInReview());
     }
 
+    /**
+     * See also SchemaDotOrgExporterTest.java for more extensive tests.
+     */
     @Test
     public void testGetJsonLd() throws ParseException {
         Dataset dataset = new Dataset();
@@ -115,14 +119,21 @@ public void testGetJsonLd() throws ParseException {
         Dataverse dataverse = new Dataverse();
         dataverse.setName("LibraScholar");
         dataset.setOwner(dataverse);
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setLicense(TermsOfUseAndAccess.License.CC0);
+        datasetVersion.setTermsOfUseAndAccess(terms);
         String jsonLd = datasetVersion.getJsonLd();
-        System.out.println("jsonLd: " + jsonLd);
+        System.out.println("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
         JsonReader jsonReader = Json.createReader(new StringReader(jsonLd));
         JsonObject obj = jsonReader.readObject();
         assertEquals("http://schema.org", obj.getString("@context"));
         assertEquals("Dataset", obj.getString("@type"));
+        assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("@id"));
         assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("identifier"));
-        assertEquals("https://schema.org/version/3.3", obj.getString("schemaVersion"));
+        assertEquals(null, obj.getString("schemaVersion", null));
+        assertEquals("Dataset", obj.getJsonObject("license").getString("@type"));
+        assertEquals("CC0", obj.getJsonObject("license").getString("text"));
+        assertEquals("https://creativecommons.org/publicdomain/zero/1.0/", obj.getJsonObject("license").getString("url"));
         assertEquals("1955-11-05", obj.getString("dateModified"));
         assertEquals("1955-11-05", obj.getString("datePublished"));
         assertEquals("1", obj.getString("version"));
@@ -130,10 +141,70 @@ public void testGetJsonLd() throws ParseException {
         assertEquals("", obj.getString("name"));
         // TODO: If it ever becomes easier to mock authors, test them.
         JsonArray emptyArray = Json.createArrayBuilder().build();
+        assertEquals(emptyArray, obj.getJsonArray("creator"));
         assertEquals(emptyArray, obj.getJsonArray("author"));
         // TODO: If it ever becomes easier to mock subjects, test them.
         assertEquals(emptyArray, obj.getJsonArray("keywords"));
-        assertEquals("Dataverse", obj.getJsonObject("provider").getString("name"));
+        assertEquals("Organization", obj.getJsonObject("publisher").getString("@type"));
+        assertEquals("LibraScholar", obj.getJsonObject("publisher").getString("name"));
+        assertEquals("Organization", obj.getJsonObject("provider").getString("@type"));
+        assertEquals("LibraScholar", obj.getJsonObject("provider").getString("name"));
+        assertEquals("LibraScholar", obj.getJsonObject("includedInDataCatalog").getString("name"));
+    }
+
+    @Test
+    public void testGetJsonLdNonCC0License() throws ParseException {
+        Dataset dataset = new Dataset();
+        dataset.setProtocol("doi");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("LK0D1H");
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setDataset(dataset);
+        datasetVersion.setVersionState(DatasetVersion.VersionState.DRAFT);
+        assertEquals("", datasetVersion.getPublicationDateAsString());
+        // Only published datasets return any JSON.
+        assertEquals("", datasetVersion.getJsonLd());
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED);
+        datasetVersion.setVersionNumber(1L);
+        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyyMMdd");
+        Date publicationDate = dateFmt.parse("19551105");
+        datasetVersion.setReleaseTime(publicationDate);
+        dataset.setPublicationDate(new Timestamp(publicationDate.getTime()));
+        Dataverse dataverse = new Dataverse();
+        dataverse.setName("LibraScholar");
+        dataset.setOwner(dataverse);
+
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setLicense(TermsOfUseAndAccess.License.NONE);
+        terms.setTermsOfUse("Call me maybe");
+        datasetVersion.setTermsOfUseAndAccess(terms);
+
+        String jsonLd = datasetVersion.getJsonLd();
+        System.out.println("jsonLd: " + JsonUtil.prettyPrint(jsonLd));
+        JsonReader jsonReader = Json.createReader(new StringReader(jsonLd));
+        JsonObject obj = jsonReader.readObject();
+        assertEquals("http://schema.org", obj.getString("@context"));
+        assertEquals("Dataset", obj.getString("@type"));
+        assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/LK0D1H", obj.getString("identifier"));
+        assertEquals(null, obj.getString("schemaVersion", null));
+        assertEquals("Dataset", obj.getJsonObject("license").getString("@type"));
+        assertEquals("Call me maybe", obj.getJsonObject("license").getString("text"));
+        assertEquals("1955-11-05", obj.getString("dateModified"));
+        assertEquals("1955-11-05", obj.getString("datePublished"));
+        assertEquals("1", obj.getString("version"));
+        // TODO: if it ever becomes easier to mock a dataset title, test it.
+        assertEquals("", obj.getString("name"));
+        // TODO: If it ever becomes easier to mock authors, test them.
+        JsonArray emptyArray = Json.createArrayBuilder().build();
+        assertEquals(emptyArray, obj.getJsonArray("creator"));
+        assertEquals(emptyArray, obj.getJsonArray("author"));
+        // TODO: If it ever becomes easier to mock subjects, test them.
+        assertEquals(emptyArray, obj.getJsonArray("keywords"));
+        assertEquals("Organization", obj.getJsonObject("publisher").getString("@type"));
+        assertEquals("LibraScholar", obj.getJsonObject("publisher").getString("name"));
+        assertEquals("Organization", obj.getJsonObject("provider").getString("@type"));
+        assertEquals("LibraScholar", obj.getJsonObject("provider").getString("name"));
         assertEquals("LibraScholar", obj.getJsonObject("includedInDataCatalog").getString("name"));
     }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java
index ce3ccc9d2f7..b49c1cfadc7 100644
--- a/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/PersistentIdentifierServiceBeanTest.java
@@ -7,6 +7,7 @@
 
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
+import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +27,7 @@ public class PersistentIdentifierServiceBeanTest {
     
     DOIEZIdServiceBean ezidServiceBean = new DOIEZIdServiceBean();
     DOIDataCiteServiceBean dataCiteServiceBean = new DOIDataCiteServiceBean();
+    FakePidProviderServiceBean fakePidProviderServiceBean = new FakePidProviderServiceBean();
     HandlenetServiceBean hdlServiceBean = new HandlenetServiceBean();
     
     CommandContext ctxt;
@@ -47,6 +49,11 @@ public DOIDataCiteServiceBean doiDataCite() {
             public DOIEZIdServiceBean doiEZId() {
                 return ezidServiceBean;
             }
+
+            @Override
+            public FakePidProviderServiceBean fakePidProvider() {
+                return fakePidProviderServiceBean;
+            }
             
         };
     }
@@ -63,7 +70,11 @@ public void testGetBean_String_CommandContext_OK() {
         ctxt.settings().setValueForKey( SettingsServiceBean.Key.DoiProvider, "DataCite");
         assertEquals(dataCiteServiceBean, 
                      GlobalIdServiceBean.getBean("doi", ctxt));
-        
+
+        ctxt.settings().setValueForKey(SettingsServiceBean.Key.DoiProvider, "FAKE");
+        assertEquals(fakePidProviderServiceBean,
+                GlobalIdServiceBean.getBean("doi", ctxt));
+
         assertEquals(hdlServiceBean, 
                      GlobalIdServiceBean.getBean("hdl", ctxt));
     }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
index 7971823c3e7..ecf7570558c 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AccessIT.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.util.HashMap;
+import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import org.hamcrest.collection.IsMapContaining;
 import static junit.framework.Assert.assertEquals;
 import static org.hamcrest.CoreMatchers.is;
@@ -59,6 +60,10 @@ public class AccessIT {
     public static String tabFile3NameRestrictedConvert;
     public static String tabFile4NameUnpublishedConvert;
     
+    public static int tabFile1SizeOriginal = 279;
+    public static int tabFile1SizeConverted = 4;
+    public static int tabFile1SizeConvertedWithVarHeader = 9; 
+    
     @BeforeClass
     public static void setUp() throws InterruptedException {
         RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
@@ -130,36 +135,38 @@ public static void setUp() throws InterruptedException {
     }
     
     @AfterClass
-    public static void tearDown() {        
+    public static void tearDown() {   
+
         Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken);
         assertEquals(200, publishDataset.getStatusCode());
-        
+
         Response deleteDatasetResponse = UtilIT.destroyDataset(datasetId, apiToken);
         deleteDatasetResponse.prettyPrint();
         assertEquals(200, deleteDatasetResponse.getStatusCode());
-        //Deleting dataset cleaning up the files
-
-        Response deleteDataverseResponse = UtilIT.deleteDataverse(dataverseAlias, apiToken);
-        deleteDataverseResponse.prettyPrint();
-        assertEquals(200, deleteDataverseResponse.getStatusCode());
 
-        Response deleteUserResponse = UtilIT.deleteUser(username);
-        deleteUserResponse.prettyPrint();
-        assertEquals(200, deleteUserResponse.getStatusCode());
     }
     
+
+    
     //This test does a lot of testing of non-original downloads as well
     @Test
     public void testDownloadSingleFile() {
         //Not logged in non-restricted
         Response anonDownloadOriginal = UtilIT.downloadFileOriginal(tabFile1Id);
         Response anonDownloadConverted = UtilIT.downloadFile(tabFile1Id);
+        // ... and download the same tabular data file, but without the variable name header added:
+        Response anonDownloadTabularNoHeader = UtilIT.downloadTabularFileNoVarHeader(tabFile1Id);
         assertEquals(OK.getStatusCode(), anonDownloadOriginal.getStatusCode());
-        assertEquals(OK.getStatusCode(), anonDownloadConverted.getStatusCode()); //just to ensure next test
+        assertEquals(OK.getStatusCode(), anonDownloadConverted.getStatusCode());
+        assertEquals(OK.getStatusCode(), anonDownloadTabularNoHeader.getStatusCode());
         int origSizeAnon = anonDownloadOriginal.getBody().asByteArray().length;
         int convertSizeAnon = anonDownloadConverted.getBody().asByteArray().length;
-        System.out.println("origSize: "+origSizeAnon + " | convertSize: " + convertSizeAnon);
-        assertThat(origSizeAnon, is(not(convertSizeAnon)));
+        int tabularSizeNoVarHeader = anonDownloadTabularNoHeader.getBody().asByteArray().length;
+        System.out.println("origSize: "+origSizeAnon + " | convertSize: " + convertSizeAnon + " | convertNoHeaderSize: " + tabularSizeNoVarHeader);
+
+        assertEquals(origSizeAnon, tabFile1SizeOriginal);
+        assertEquals(convertSizeAnon, tabFile1SizeConvertedWithVarHeader);        
+        assertEquals(tabularSizeNoVarHeader, tabFile1SizeConverted);
         
         //Not logged in restricted
         Response anonDownloadOriginalRestricted = UtilIT.downloadFileOriginal(tabFile3IdRestricted);
@@ -182,7 +189,7 @@ public void testDownloadSingleFile() {
         int convertSizeAuth = authDownloadConverted.getBody().asByteArray().length;
         System.out.println("origSize: "+origSizeAuth + " | convertSize: " + convertSizeAuth);
         assertThat(origSizeAuth, is(not(convertSizeAuth)));  
-        
+                
         //Logged in restricted
         Response authDownloadOriginalRestricted = UtilIT.downloadFileOriginal(tabFile3IdRestricted, apiToken);
         Response authDownloadConvertedRestricted = UtilIT.downloadFile(tabFile3IdRestricted, apiToken);
@@ -402,5 +409,75 @@ private HashMap readZipResponse(InputStream iStrea
         return fileStreams;
     }
     
+    @Test
+    public void testRequestAccess() throws InterruptedException {
+
+        String pathToJsonFile = "scripts/api/data/dataset-create-new.json";
+        Response createDatasetResponse = UtilIT.createDatasetViaNativeApi(dataverseAlias, pathToJsonFile, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetIdNew = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        String tabFile3NameRestrictedNew = "stata13-auto-withstrls.dta";
+        String tab3PathToFile = "scripts/search/data/tabular/" + tabFile3NameRestrictedNew;
+        Thread.sleep(1000); //Added because tests are failing during setup, test is probably going too fast. Especially between first and second file
+        Response tab3AddResponse = UtilIT.uploadFileViaNative(datasetIdNew.toString(), tab3PathToFile, apiToken);
+        Integer tabFile3IdRestrictedNew = JsonPath.from(tab3AddResponse.body().asString()).getInt("data.files[0].dataFile.id");
+        Thread.sleep(3000); //Dataverse needs more time...
+        Response restrictResponse = UtilIT.restrictFile(tabFile3IdRestrictedNew.toString(), true, apiToken);
+        restrictResponse.prettyPrint();
+        restrictResponse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        assertEquals(200, createUser.getStatusCode());
+        String apiTokenRando = UtilIT.getApiTokenFromResponse(createUser);
+        String apiIdentifierRando = UtilIT.getUsernameFromResponse(createUser);
+
+        Response randoDownload = UtilIT.downloadFile(tabFile3IdRestrictedNew, apiTokenRando);
+        assertEquals(403, randoDownload.getStatusCode());
+
+        Response requestFileAccessResponse = UtilIT.requestFileAccess(tabFile3IdRestrictedNew.toString(), apiTokenRando);
+        //Cannot request until we set the dataset to allow requests
+        assertEquals(400, requestFileAccessResponse.getStatusCode());
+        //Update Dataset to allow requests
+        Response allowAccessRequestsResponse = UtilIT.allowAccessRequests(datasetIdNew.toString(), true, apiToken);
+        assertEquals(200, allowAccessRequestsResponse.getStatusCode());
+        //Must republish to get it to work
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetIdNew, "major", apiToken);
+        assertEquals(200, publishDataset.getStatusCode());
+
+        requestFileAccessResponse = UtilIT.requestFileAccess(tabFile3IdRestrictedNew.toString(), apiTokenRando);
+        assertEquals(200, requestFileAccessResponse.getStatusCode());
+
+        Response listAccessRequestResponse = UtilIT.getAccessRequestList(tabFile3IdRestrictedNew.toString(), apiToken);
+        listAccessRequestResponse.prettyPrint();
+        assertEquals(200, listAccessRequestResponse.getStatusCode());
+        System.out.println("List Access Request: " + listAccessRequestResponse.prettyPrint());
+
+        listAccessRequestResponse = UtilIT.getAccessRequestList(tabFile3IdRestrictedNew.toString(), apiTokenRando);
+        listAccessRequestResponse.prettyPrint();
+        assertEquals(400, listAccessRequestResponse.getStatusCode());
+
+        Response rejectFileAccessResponse = UtilIT.rejectFileAccessRequest(tabFile3IdRestrictedNew.toString(), "@" + apiIdentifierRando, apiToken);
+        assertEquals(200, rejectFileAccessResponse.getStatusCode());
+
+        requestFileAccessResponse = UtilIT.requestFileAccess(tabFile3IdRestrictedNew.toString(), apiTokenRando);
+        //grant file access
+        Response grantFileAccessResponse = UtilIT.grantFileAccess(tabFile3IdRestrictedNew.toString(), "@" + apiIdentifierRando, apiToken);
+        assertEquals(200, grantFileAccessResponse.getStatusCode());
+
+        //Now should be able to download
+        randoDownload = UtilIT.downloadFile(tabFile3IdRestrictedNew, apiTokenRando);
+        assertEquals(OK.getStatusCode(), randoDownload.getStatusCode());
+
+        //revokeFileAccess        
+        Response revokeFileAccessResponse = UtilIT.revokeFileAccess(tabFile3IdRestrictedNew.toString(), "@" + apiIdentifierRando, apiToken);
+        assertEquals(200, revokeFileAccessResponse.getStatusCode());
+
+        listAccessRequestResponse = UtilIT.getAccessRequestList(tabFile3IdRestrictedNew.toString(), apiToken);
+        assertEquals(400, listAccessRequestResponse.getStatusCode());
+    }
+
 
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
index 94b207969b6..fdeda63145f 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
@@ -60,7 +60,8 @@ public static void setUpClass() {
         Response removeExcludeEmail = UtilIT.deleteSetting(SettingsServiceBean.Key.ExcludeEmailFromExport);
         removeExcludeEmail.then().assertThat()
                 .statusCode(200);
-
+        /* With Dual mode, we can no longer mess with upload methods since native is now required for anything to work
+               
         Response removeDcmUrl = UtilIT.deleteSetting(SettingsServiceBean.Key.DataCaptureModuleUrl);
         removeDcmUrl.then().assertThat()
                 .statusCode(200);
@@ -68,6 +69,7 @@ public static void setUpClass() {
         Response removeUploadMethods = UtilIT.deleteSetting(SettingsServiceBean.Key.UploadMethods);
         removeUploadMethods.then().assertThat()
                 .statusCode(200);
+         */
     }
 
     @AfterClass
@@ -80,7 +82,7 @@ public static void afterClass() {
         Response removeExcludeEmail = UtilIT.deleteSetting(SettingsServiceBean.Key.ExcludeEmailFromExport);
         removeExcludeEmail.then().assertThat()
                 .statusCode(200);
-
+        /* See above
         Response removeDcmUrl = UtilIT.deleteSetting(SettingsServiceBean.Key.DataCaptureModuleUrl);
         removeDcmUrl.then().assertThat()
                 .statusCode(200);
@@ -88,6 +90,7 @@ public static void afterClass() {
         Response removeUploadMethods = UtilIT.deleteSetting(SettingsServiceBean.Key.UploadMethods);
         removeUploadMethods.then().assertThat()
                 .statusCode(200);
+         */
     }
 
     @Test
@@ -316,7 +319,7 @@ public void testCreatePublishDestroyDataset() {
         // FIXME: It would be awesome if we could just get a JSON object back instead. :(
         Map datasetContactFromExport = with(exportDatasetAsJson.body().asString()).param("datasetContact", "datasetContact")
                 .getJsonObject("datasetVersion.metadataBlocks.citation.fields.find { fields -> fields.typeName == datasetContact }");
-        System.out.println("datasetContactFromExport: " + datasetContactFromExport);
+        logger.info("datasetContactFromExport: " + datasetContactFromExport);
 
         assertEquals("datasetContact", datasetContactFromExport.get("typeName"));
         List valuesArray = (ArrayList) datasetContactFromExport.get("value");
@@ -446,7 +449,7 @@ public void testExport() {
         // FIXME: It would be awesome if we could just get a JSON object back instead. :(
         Map datasetContactFromExport = with(exportDatasetAsJson.body().asString()).param("datasetContact", "datasetContact")
                 .getJsonObject("datasetVersion.metadataBlocks.citation.fields.find { fields -> fields.typeName == datasetContact }");
-        System.out.println("datasetContactFromExport: " + datasetContactFromExport);
+        logger.info("datasetContactFromExport: " + datasetContactFromExport);
 
         assertEquals("datasetContact", datasetContactFromExport.get("typeName"));
         List valuesArray = (ArrayList) datasetContactFromExport.get("value");
@@ -633,7 +636,7 @@ public void testSequentialNumberAsIdentifierGenerationStyle() {
                 .statusCode(OK.getStatusCode());
 
         String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
-        System.out.println("identifier: " + identifier);
+        logger.info("identifier: " + identifier);
         String numericPart = identifier.replace("FK2/", ""); //remove shoulder from identifier
         assertTrue(StringUtils.isNumeric(numericPart));
 
@@ -677,7 +680,7 @@ public void testPrivateUrl() {
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
-        System.out.println("dataset id: " + datasetId);
+        logger.info("dataset id: " + datasetId);
 
         Response createContributorResponse = UtilIT.createRandomUser();
         String contributorUsername = UtilIT.getUsernameFromResponse(createContributorResponse);
@@ -758,6 +761,14 @@ public void testPrivateUrl() {
          * asadmin create-jvm-options
          * "-Ddataverse.siteUrl=http\://localhost\:8080"
          */
+        
+        /* 
+         * Attempt to follow the private link url; as a user not otherwise 
+         * authorized to view the draft - and make sure they get the dataset page:
+         * 
+         * MAKE SURE TO READ the note below, about jsessions and cookies!
+        */
+        
         Response getDatasetAsUserWhoClicksPrivateUrl = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .get(urlWithToken);
@@ -765,6 +776,70 @@ public void testPrivateUrl() {
         assertEquals("Darwin's Finches - " + dataverseAlias, title);
         assertEquals(OK.getStatusCode(), getDatasetAsUserWhoClicksPrivateUrl.getStatusCode());
 
+        /*
+         * NOTE, this is what happens when we attempt to access the dataset via the 
+         * private url, as implemented above: 
+         * 
+         * The private url page authorizes the user to view the dataset 
+         * by issuing a new jsession, and issuing a 302 redirect to the dataset 
+         * page WITH THE JSESSIONID ADDED TO THE URL - as in 
+         * dataset.xhtml?persistentId=xxx&jsessionid=yyy
+         * RestAssured's .get() method follows redirects by default - so in the 
+         * end the above works and we get the correct dataset. 
+         * But note that this relies on the jsessionid in the url. We've 
+         * experimented with disabling url-supplied jsessions (in PR #5316); 
+         * then the above stopped working - because now jsession is supplied 
+         * AS A COOKIE, which the RestAssured code above does not use, so 
+         * the dataset page refuses to show the dataset to the user. (So the 
+         * assertEquals code above fails, because the page title is not "Darwin's Finches", 
+         * but "Login Page")
+         * Below is an implementation of the test above that uses the jsession 
+         * cookie, instead of relying on the jsessionid in the URL: 
+         
+        // This should redirect us to the actual dataset page, and 
+        // give us a valid session cookie: 
+        
+        Response getDatasetAsUserWhoClicksPrivateUrl = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .redirects().follow(false)
+                .get(urlWithToken);
+        // (note that we have purposefully asked not to follow redirects 
+        // automatically; this way we can test that we are being redirected
+        // to the right place, that we've been given the session cookie, etc.
+                
+        assertEquals(FOUND.getStatusCode(), getDatasetAsUserWhoClicksPrivateUrl.getStatusCode());
+        // Yes, javax.ws.rs.core.Response.Status.FOUND is 302!
+        String title = getDatasetAsUserWhoClicksPrivateUrl.getBody().htmlPath().getString("html.head.title");
+        assertEquals("Document moved", title);
+        
+        String redirectLink = getDatasetAsUserWhoClicksPrivateUrl.getBody().htmlPath().getString("html.body.a.@href");
+        assertNotNull(redirectLink);
+        assertTrue(redirectLink.contains("dataset.xhtml"));
+        
+        String jsessionid = getDatasetAsUserWhoClicksPrivateUrl.cookie("jsessionid");
+        assertNotNull(jsessionid);
+        
+        // ... and now we can try and access the dataset, with another HTTP GET, 
+        // sending the jsession cookie along:
+        
+        try { 
+            redirectLink = URLDecoder.decode(redirectLink, "UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            // do nothing - try to redirect to the url as is? 
+        }
+        
+        logger.info("redirecting to "+redirectLink+", using jsession "+jsessionid);
+        
+        getDatasetAsUserWhoClicksPrivateUrl = given()
+                .cookies("JSESSIONID", jsessionid)
+                .get(redirectLink);
+        
+        assertEquals(OK.getStatusCode(), getDatasetAsUserWhoClicksPrivateUrl.getStatusCode());
+        title = getDatasetAsUserWhoClicksPrivateUrl.getBody().htmlPath().getString("html.head.title");
+        assertEquals("Darwin's Finches - " + dataverseAlias, title);
+         
+        */
+        
         Response junkPrivateUrlToken = given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .get("/privateurl.xhtml?token=" + "junk");
@@ -939,7 +1014,7 @@ public void testFileChecksum() {
         Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
         createDatasetResponse.prettyPrint();
         Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
-        System.out.println("dataset id: " + datasetId);
+        logger.info("dataset id: " + datasetId);
 
         Response getDatasetJsonNoFiles = UtilIT.nativeGet(datasetId, apiToken);
         getDatasetJsonNoFiles.prettyPrint();
@@ -1124,9 +1199,9 @@ public void testCreateDatasetWithDcmDependency() {
         Response getRsyncScriptPermErrorGuest = UtilIT.getRsyncScript(datasetPersistentId, nullTokenToIndicateGuest);
         getRsyncScriptPermErrorGuest.prettyPrint();
         getRsyncScriptPermErrorGuest.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
                 .contentType(ContentType.JSON)
-                .body("message", equalTo("User :guest is not permitted to perform requested action."))
-                .statusCode(UNAUTHORIZED.getStatusCode());
+                .body("message", equalTo("Please provide a key query parameter (?key=XXX) or via the HTTP header X-Dataverse-key"));
 
         Response createNoPermsUser = UtilIT.createRandomUser();
         String noPermsUsername = UtilIT.getUsernameFromResponse(createNoPermsUser);
@@ -1273,7 +1348,9 @@ public void testDcmChecksumValidationMessages() throws IOException, InterruptedE
         String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
         String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
         String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.identifier");
+        logger.info("identifier: " + identifier);
         String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+        logger.info("datasetPersistentId: " + datasetPersistentId);
 
         /**
          * Here we are pretending to be the Data Capture Module reporting on if
@@ -1334,23 +1411,32 @@ public void testDcmChecksumValidationMessages() throws IOException, InterruptedE
         removeUploadMethods.then().assertThat()
                 .statusCode(200);
 
-        String uploadFolder = identifier;
+        String uploadFolder = identifier.split("FK2/")[1];
+        logger.info("uploadFolder: " + uploadFolder);
 
         /**
          * The "extra testing" involves having this REST Assured test do two
          * jobs done by the rsync script and the DCM. The rsync script creates
          * "files.sha" and (if checksum validation succeeds) the DCM moves the
          * files and the "files.sha" file into the uploadFolder.
+         *
+         * The whole test was disabled in ae6b0a7 so we are changing
+         * doExtraTesting to true.
          */
-        boolean doExtraTesting = false;
+        boolean doExtraTesting = true;
 
         if (doExtraTesting) {
 
             String SEP = java.io.File.separator;
             // Set this to where you keep your files in dev. It might be nice to have an API to query to get this location from Dataverse.
-            String dsDir = "/Users/pdurbin/dataverse/files/10.5072/FK2";
-            java.nio.file.Files.createDirectories(java.nio.file.Paths.get(dsDir + SEP + identifier));
-            java.nio.file.Files.createDirectories(java.nio.file.Paths.get(dsDir + SEP + identifier + SEP + uploadFolder));
+            // TODO: Think more about if dsDir should end with "/FK2" or not.
+            String dsDir = "/usr/local/glassfish4/glassfish/domains/domain1/files/10.5072";
+            String dsDirPlusIdentifier = dsDir + SEP + identifier;
+            logger.info("dsDirPlusIdentifier: " + dsDirPlusIdentifier);
+            java.nio.file.Files.createDirectories(java.nio.file.Paths.get(dsDirPlusIdentifier));
+            String dsDirPlusIdentifierPlusUploadFolder = dsDir + SEP + identifier + SEP + uploadFolder;
+            logger.info("dsDirPlusIdentifierPlusUploadFolder: " + dsDirPlusIdentifierPlusUploadFolder);
+            java.nio.file.Files.createDirectories(java.nio.file.Paths.get(dsDirPlusIdentifierPlusUploadFolder));
             String checksumFilename = "files.sha";
             String filename1 = "file1.txt";
             String fileContent1 = "big data!";
@@ -1387,8 +1473,8 @@ public void testDcmChecksumValidationMessages() throws IOException, InterruptedE
         if (doExtraTesting) {
 
             uploadSuccessful.then().assertThat()
-                    .body("data.message", equalTo("FileSystemImportJob in progress"))
-                    .statusCode(200);
+                    .statusCode(200)
+                    .body("data.message", equalTo("FileSystemImportJob in progress"));
 
             if (doExtraTesting) {
 
@@ -1397,11 +1483,11 @@ public void testDcmChecksumValidationMessages() throws IOException, InterruptedE
                 Response datasetAsJson2 = UtilIT.nativeGet(datasetId, apiToken);
                 datasetAsJson2.prettyPrint();
                 datasetAsJson2.then().assertThat()
-                        .body("data.latestVersion.files[0].dataFile.filename", equalTo(identifier))
+                        .statusCode(OK.getStatusCode())
+                        .body("data.latestVersion.files[0].dataFile.filename", equalTo(uploadFolder))
                         .body("data.latestVersion.files[0].dataFile.contentType", equalTo("application/vnd.dataverse.file-package"))
                         .body("data.latestVersion.files[0].dataFile.filesize", equalTo(totalSize))
-                        .body("data.latestVersion.files[0].dataFile.checksum.type", equalTo("SHA-1"))
-                        .statusCode(OK.getStatusCode());
+                        .body("data.latestVersion.files[0].dataFile.checksum.type", equalTo("SHA-1"));
             }
         }
         logger.info("username/password: " + username);
@@ -1532,4 +1618,60 @@ public void testDatasetLocksApi() {
                 .statusCode(200);
     }
     
+    /**
+     * This test requires the root dataverse to be published to pass.
+     */
+    @Test
+    public void testUpdatePIDMetadataAPI() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        assertEquals(200, createUser.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+        Response makeSuperUser = UtilIT.makeSuperUser(username);
+        assertEquals(200, makeSuperUser.getStatusCode());
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+
+        Response getDatasetJsonBeforePublishing = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonBeforePublishing.prettyPrint();
+        String protocol = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.protocol");
+        String authority = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.authority");
+        String identifier = JsonPath.from(getDatasetJsonBeforePublishing.getBody().asString()).getString("data.identifier");
+        String datasetPersistentId = protocol + ":" + authority + "/" + identifier;
+
+        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        assertEquals(200, publishDataverse.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPersistentId, "major", apiToken);
+        assertEquals(200, publishDataset.getStatusCode());
+
+        Response getDatasetJsonAfterPublishing = UtilIT.nativeGet(datasetId, apiToken);
+        getDatasetJsonAfterPublishing.prettyPrint();
+        getDatasetJsonAfterPublishing.then().assertThat()
+                .body("data.latestVersion.versionNumber", equalTo(1))
+                .body("data.latestVersion.versionMinorNumber", equalTo(0))
+                .body("data.latestVersion.metadataBlocks.citation.fields[2].value[0].datasetContactEmail.value", equalTo("finch@mailinator.com"))
+                .statusCode(OK.getStatusCode());
+
+        String pathToJsonFilePostPub = "doc/sphinx-guides/source/_static/api/dataset-add-metadata-after-pub.json";
+        Response addDataToPublishedVersion = UtilIT.addDatasetMetadataViaNative(datasetPersistentId, pathToJsonFilePostPub, apiToken);
+        addDataToPublishedVersion.prettyPrint();
+        addDataToPublishedVersion.then().assertThat().statusCode(OK.getStatusCode());
+
+        Response updatePIDMetadata = UtilIT.updateDatasetPIDMetadata(datasetPersistentId, apiToken);
+        updatePIDMetadata.prettyPrint();
+        updatePIDMetadata.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        logger.info("datasetPersistentId: " + datasetPersistentId);
+
+    }
+    
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
index 5e4e091bff2..20403bd8480 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java
@@ -246,13 +246,14 @@ public void testMoveDataverse() {
         createDataverseResponse.prettyPrint();
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
         Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverseResponse);
-        Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken);
+        
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);//.publishDataverseViaSword(dataverseAlias, apiToken);
         assertEquals(200, publishDataverse.getStatusCode());
         
         Response createDataverseResponse2 = UtilIT.createRandomDataverse(apiToken);
         createDataverseResponse2.prettyPrint();
         String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
-        Response publishDataverse2 = UtilIT.publishDataverseViaSword(dataverseAlias2, apiToken);
+        Response publishDataverse2 = UtilIT.publishDataverseViaNativeApi(dataverseAlias2, apiToken);
         assertEquals(200, publishDataverse2.getStatusCode());
         
         Response moveResponse = UtilIT.moveDataverse(dataverseAlias, dataverseAlias2, true, apiToken);
@@ -300,4 +301,59 @@ public void testCreateDeleteDataverseLink() {
                 .statusCode(200);
     }
     
+    @Test
+    public void testUpdateDefaultContributorRole() {
+        Response createUser = UtilIT.createRandomUser();
+
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response superuserResponse = UtilIT.makeSuperUser(username);
+
+        Response createUserRando = UtilIT.createRandomUser();
+
+        createUserRando.prettyPrint();
+        String apiTokenRando = UtilIT.getApiTokenFromResponse(createUserRando);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        //Try no perms user
+        Response updateDataverseDefaultRoleNoPerms = UtilIT.updateDefaultContributorsRoleOnDataverse(dataverseAlias, "curator", apiTokenRando);
+        updateDataverseDefaultRoleNoPerms.prettyPrint();
+        updateDataverseDefaultRoleNoPerms.then().assertThat()
+                .statusCode(401);
+        
+        // try role with no dataset permissions alias
+        Response updateDataverseDefaultRoleBadRolePermissions = UtilIT.updateDefaultContributorsRoleOnDataverse(dataverseAlias, "dvContributor", apiToken);
+        updateDataverseDefaultRoleBadRolePermissions.prettyPrint();
+        updateDataverseDefaultRoleBadRolePermissions.then().assertThat()
+                .body("message", equalTo("Role dvContributor does not have dataset permissions."))
+                .statusCode(400);
+
+        //for test use an existing role. In practice this likely will be a custom role
+        Response updateDataverseDefaultRole = UtilIT.updateDefaultContributorsRoleOnDataverse(dataverseAlias, "curator", apiToken);
+        updateDataverseDefaultRole.prettyPrint();
+        updateDataverseDefaultRole.then().assertThat()
+                .body("data.message", equalTo("Default contributor role for Dataverse " + dataverseAlias + " has been set to Curator."))
+                .statusCode(200);
+        
+        //for test use an existing role. In practice this likely will be a custom role
+        Response updateDataverseDefaultRoleNone = UtilIT.updateDefaultContributorsRoleOnDataverse(dataverseAlias, "none", apiToken);
+        updateDataverseDefaultRoleNone.prettyPrint();
+        updateDataverseDefaultRoleNone.then().assertThat()
+                .body("data.message", equalTo("Default contributor role for Dataverse " + dataverseAlias + " has been set to None."))
+                .statusCode(200);
+
+        // try bad role alias
+        Response updateDataverseDefaultRoleBadRoleAlias = UtilIT.updateDefaultContributorsRoleOnDataverse(dataverseAlias, "colonel", apiToken);
+        updateDataverseDefaultRoleBadRoleAlias.prettyPrint();
+        updateDataverseDefaultRoleBadRoleAlias.then().assertThat()
+                .body("message", equalTo("Role colonel not found."))
+                .statusCode(404);
+
+    }
+    
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
index b0b181e2962..15b8ba2f416 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
@@ -27,6 +27,7 @@
 import static junit.framework.Assert.assertEquals;
 import org.hamcrest.CoreMatchers;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.CoreMatchers.nullValue;
 import org.hamcrest.Matchers;
 import org.junit.AfterClass;
@@ -286,7 +287,8 @@ public void test_005_AddFileBadPermissions() {
     }
 
     @Test
-    public void test_006_ReplaceFileGood() {
+    public void test_006_ReplaceFileGood() throws InterruptedException {
+        
         msgt("test_006_ReplaceFileGood");
 
         // Create user
@@ -302,7 +304,7 @@ public void test_006_ReplaceFileGood() {
         // Add initial file
         // -------------------------
         msg("Add initial file");
-        String pathToFile = "scripts/search/data/replace_test/growing_file/2016-01/data.tsv";
+        String pathToFile = "scripts/search/data/replace_test/003.txt";
         Response addResponse = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken);
 
         String successMsgAdd = ResourceBundle.getBundle("Bundle").getString("file.addreplace.success.add");        
@@ -313,8 +315,8 @@ public void test_006_ReplaceFileGood() {
                  * via API in a consistent location.
                  */
                 //                .body("message", equalTo(successMsgAdd))
-                .body("data.files[0].dataFile.contentType", equalTo("text/tsv"))
-                .body("data.files[0].label", equalTo("data.tsv"))
+                .body("data.files[0].dataFile.contentType", startsWith("text/plain"))
+                .body("data.files[0].label", equalTo("003.txt"))
                 .body("data.files[0].description", equalTo(""))
                 .statusCode(OK.getStatusCode());
         
@@ -349,7 +351,7 @@ public void test_006_ReplaceFileGood() {
         
         msgt(replaceRespWrongCtype.prettyPrint());
         
-        String errMsgCtype = BundleUtil.getStringFromBundle("file.addreplace.error.replace.new_file_has_different_content_type", Arrays.asList("Tab-Delimited", "GIF Image"));
+        String errMsgCtype = BundleUtil.getStringFromBundle("file.addreplace.error.replace.new_file_has_different_content_type", Arrays.asList("Plain Text", "GIF Image"));
 
 
         replaceRespWrongCtype.prettyPrint();
@@ -363,11 +365,9 @@ public void test_006_ReplaceFileGood() {
         // Replace file
         // -------------------------
         msg("Replace file - 1st time");
-        String pathToFile2 = "scripts/search/data/replace_test/growing_file/2016-02/data.tsv";
+        String pathToFile2 = "scripts/search/data/replace_test/004.txt";
         JsonObjectBuilder json = Json.createObjectBuilder()
-                // "forceReplace=true required after pull request #4854 was merged
-                .add("forceReplace", true)
-                .add("description", "My Tabular Data")
+                .add("description", "My Text File")
                 .add("categories", Json.createArrayBuilder()
                         .add("Data")
                 );
@@ -383,9 +383,9 @@ public void test_006_ReplaceFileGood() {
                  * via API in a consistent location.
                  */
                 //                .body("message", equalTo(successMsg2))
-                .body("data.files[0].label", equalTo("data.tsv"))
-                .body("data.files[0].dataFile.contentType", equalTo("text/tsv"))
-                .body("data.files[0].description", equalTo("My Tabular Data"))
+                .body("data.files[0].label", equalTo("004.txt"))
+                .body("data.files[0].dataFile.contentType", startsWith("text/plain"))
+                .body("data.files[0].description", equalTo("My Text File"))
                 .body("data.files[0].categories[0]", equalTo("Data"))
                 //.body("data.rootDataFileId", equalTo(origFileId))              
                 .statusCode(OK.getStatusCode());
@@ -411,10 +411,8 @@ public void test_006_ReplaceFileGood() {
         // Replace file (again)
         // -------------------------
         msg("Replace file (again)");
-        String pathToFile3 = "scripts/search/data/replace_test/growing_file/2016-03/data.tsv";
-        JsonObjectBuilder json2 = Json.createObjectBuilder()
-                // "forceReplace=true" required after pull request #4854 was merged
-                .add("forceReplace", true);
+        String pathToFile3 = "scripts/search/data/replace_test/005.txt";
+        JsonObjectBuilder json2 = Json.createObjectBuilder();
         Response replaceResp2 = UtilIT.replaceFile(newDataFileId.toString(), pathToFile3, json2.build(), apiToken);
         
         msgt("2nd replace: " + replaceResp2.prettyPrint());
@@ -427,7 +425,7 @@ public void test_006_ReplaceFileGood() {
                 //                .body("message", equalTo(successMsg2))
                 .statusCode(OK.getStatusCode())
                 .body("status", equalTo(AbstractApiBean.STATUS_OK))
-                .body("data.files[0].label", equalTo("data.tsv"))
+                .body("data.files[0].label", equalTo("005.txt"))
                 // yes, replacing a file blanks out the description (and categories)
                 .body("data.files[0].description", equalTo(""))
                 ;
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java b/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java
index 318325eb40c..f2f036676e6 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/InReviewWorkflowIT.java
@@ -232,7 +232,13 @@ public void testCuratorSendsCommentsToAuthor() throws InterruptedException {
                 Response returnToAuthor = UtilIT.returnDatasetToAuthor(datasetPersistentId, jsonObjectBuilder.build(), curatorApiToken);
                 returnToAuthor.prettyPrint();
             } else {
-                Thread.sleep(2000);
+                // Increasing the sleep delay here, from 2 to 10 sec.; 
+                // With the 2 sec. delay, it appears to have been working consistently
+                // on the phoenix server (because it's fast, I'm guessing?) - but 
+                // I kept seeing an error on my own build at this point once in a while, 
+                // because the dataset is still locked when we try to edit it, 
+                // a few lines down. -- L.A. Oct. 2018
+                Thread.sleep(10000);
             }
         }
 
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java
index 7bb571408ea..f0ae408b761 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/MetricsIT.java
@@ -7,7 +7,11 @@
 import static org.junit.Assert.assertEquals;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
+//TODO: These tests are fairly flawed as they don't actually add data to compare on.
+//To improve these tests we should try adding data and see if the number DOESN'T
+//go up to show that the caching worked
 public class MetricsIT {
 
     @BeforeClass
@@ -92,16 +96,107 @@ public void testGetDownloadsToMonth() {
 
         assertEquals(precache, postcache);
     }
+    
+        
+    @Test
+    public void testGetDataversesPastDays() {
+        String days = "30";
+
+        Response response = UtilIT.metricsDataversesPastDays(days);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsDataversesPastDays(days);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+    }
+    
+    @Test
+    public void testGetDatasetsPastDays() {
+        String days = "30";
+
+        Response response = UtilIT.metricsDatasetsPastDays(days);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsDatasetsPastDays(days);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+    }
+    
+    
+    @Test
+    public void testGetFilesPastDays() {
+        String days = "30";
+
+        Response response = UtilIT.metricsFilesPastDays(days);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsFilesPastDays(days);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+    }
+    
+    @Test
+    public void testGetDownloadsPastDays() {
+        String days = "30";
+
+        Response response = UtilIT.metricsDownloadsPastDays(days);
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsDownloadsPastDays(days);
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+    }    
+    
 
     @Test
     public void testGetDataverseByCategory() {
-        Response response = UtilIT.metricsDataverseByCategory();
+        Response response = UtilIT.metricsDataversesByCategory();
+        String precache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        //Run each query twice and compare results to tests caching
+        response = UtilIT.metricsDataversesByCategory();
+        String postcache = response.prettyPrint();
+        response.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        assertEquals(precache, postcache);
+    }
+    
+    @Test
+    public void testGetDataverseBySubject() {
+        Response response = UtilIT.metricsDataversesBySubject();
         String precache = response.prettyPrint();
         response.then().assertThat()
                 .statusCode(OK.getStatusCode());
 
         //Run each query twice and compare results to tests caching
-        response = UtilIT.metricsDataverseByCategory();
+        response = UtilIT.metricsDataversesBySubject();
         String postcache = response.prettyPrint();
         response.then().assertThat()
                 .statusCode(OK.getStatusCode());
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java
new file mode 100644
index 00000000000..acdd86a96e8
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java
@@ -0,0 +1,172 @@
+package edu.harvard.iq.dataverse.api;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.response.Response;
+import edu.harvard.iq.dataverse.authorization.DataverseRole;
+import java.util.logging.Logger;
+import static javax.ws.rs.core.Response.Status.CREATED;
+import static javax.ws.rs.core.Response.Status.FORBIDDEN;
+import static javax.ws.rs.core.Response.Status.OK;
+import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static org.hamcrest.CoreMatchers.equalTo;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MoveIT {
+
+    private static final Logger logger = Logger.getLogger(MoveIT.class.getCanonicalName());
+
+    @BeforeClass
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testMoveDataset() {
+
+        Response createCurator = UtilIT.createRandomUser();
+        createCurator.prettyPrint();
+        createCurator.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String curatorUsername = UtilIT.getUsernameFromResponse(createCurator);
+        String curatorApiToken = UtilIT.getApiTokenFromResponse(createCurator);
+
+        Response createCuratorDataverse1 = UtilIT.createRandomDataverse(curatorApiToken);
+        createCuratorDataverse1.prettyPrint();
+        createCuratorDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String curatorDataverseAlias1 = UtilIT.getAliasFromResponse(createCuratorDataverse1);
+
+        Response createAuthor = UtilIT.createRandomUser();
+        createAuthor.prettyPrint();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String authorUsername = UtilIT.getUsernameFromResponse(createAuthor);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        // Whoops, the curator forgot to give the author permission to create a dataset.
+        Response noPermToCreateDataset = UtilIT.createRandomDatasetViaNativeApi(curatorDataverseAlias1, authorApiToken);
+        noPermToCreateDataset.prettyPrint();
+        noPermToCreateDataset.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("User @" + authorUsername + " is not permitted to perform requested action."));
+
+        Response grantAuthorAddDataset = UtilIT.grantRoleOnDataverse(curatorDataverseAlias1, DataverseRole.DS_CONTRIBUTOR.toString(), "@" + authorUsername, curatorApiToken);
+        grantAuthorAddDataset.prettyPrint();
+        grantAuthorAddDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.assignee", equalTo("@" + authorUsername))
+                .body("data._roleAlias", equalTo("dsContributor"));
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(curatorDataverseAlias1, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        Response moveDatasetFailAlreadyThere = UtilIT.moveDataset(datasetId.toString(), curatorDataverseAlias1, curatorApiToken);
+        moveDatasetFailAlreadyThere.prettyPrint();
+        moveDatasetFailAlreadyThere.then().assertThat()
+                .statusCode(FORBIDDEN.getStatusCode())
+                .body("message", equalTo("Dataset already in this Dataverse "));
+
+        Response createAuthorDataverse1 = UtilIT.createRandomDataverse(curatorApiToken);
+        createAuthorDataverse1.prettyPrint();
+        createAuthorDataverse1.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String authorDataverseAlias1 = UtilIT.getAliasFromResponse(createAuthorDataverse1);
+
+        Response moveDatasetFail = UtilIT.moveDataset(datasetId.toString(), authorDataverseAlias1, authorApiToken);
+        moveDatasetFail.prettyPrint();
+        moveDatasetFail.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("User @" + authorUsername + " is not permitted to perform requested action."));
+
+        Response createSuperuser = UtilIT.createRandomUser();
+        createSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String superusername = UtilIT.getUsernameFromResponse(createSuperuser);
+        String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser);
+        Response makeSuperuser = UtilIT.makeSuperUser(superusername);
+        makeSuperuser.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response moveDataset1 = UtilIT.moveDataset(datasetId.toString(), authorDataverseAlias1, superuserApiToken);
+        moveDataset1.prettyPrint();
+        moveDataset1.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataset moved successfully"));
+
+        Response moveDataset2 = UtilIT.moveDataset(datasetId.toString(), curatorDataverseAlias1, superuserApiToken);
+        moveDataset2.prettyPrint();
+        moveDataset2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataset moved successfully"));
+
+        Response createCuratorDataverse2 = UtilIT.createRandomDataverse(curatorApiToken);
+        createCuratorDataverse2.prettyPrint();
+        createCuratorDataverse2.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String curatorDataverseAlias2 = UtilIT.getAliasFromResponse(createCuratorDataverse2);
+
+        Response moveDatasetFailNoPermToPublishDv = UtilIT.moveDataset(datasetId.toString(), curatorDataverseAlias2, authorApiToken);
+        moveDatasetFailNoPermToPublishDv.prettyPrint();
+        moveDatasetFailNoPermToPublishDv.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("User @" + authorUsername + " is not permitted to perform requested action."));
+
+        Response moveDataset3 = UtilIT.moveDataset(datasetId.toString(), curatorDataverseAlias2, curatorApiToken);
+        moveDataset3.prettyPrint();
+        moveDataset3.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.message", equalTo("Dataset moved successfully"));
+
+    }
+
+    @Test
+    public void testMoveDatasetThief() {
+
+        Response createAuthor = UtilIT.createRandomUser();
+        createAuthor.prettyPrint();
+        createAuthor.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String authorUsername = UtilIT.getUsernameFromResponse(createAuthor);
+        String authorApiToken = UtilIT.getApiTokenFromResponse(createAuthor);
+
+        Response createThief = UtilIT.createRandomUser();
+        createThief.prettyPrint();
+        createThief.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        String thiefUsername = UtilIT.getUsernameFromResponse(createThief);
+        String thiefApiToken = UtilIT.getApiTokenFromResponse(createThief);
+
+        Response createAuthorDataverse = UtilIT.createRandomDataverse(authorApiToken);
+        createAuthorDataverse.prettyPrint();
+        createAuthorDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String authorDataverseAlias = UtilIT.getAliasFromResponse(createAuthorDataverse);
+
+        Response createDataset = UtilIT.createRandomDatasetViaNativeApi(authorDataverseAlias, authorApiToken);
+        createDataset.prettyPrint();
+        createDataset.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset);
+
+        // Can the thief steal the dataset?
+        Response createThiefDataverse = UtilIT.createRandomDataverse(thiefApiToken);
+        createThiefDataverse.prettyPrint();
+        createThiefDataverse.then().assertThat()
+                .statusCode(CREATED.getStatusCode());
+        String thiefDataverseAlias = UtilIT.getAliasFromResponse(createThiefDataverse);
+
+        Response thiefAttemptToStealDataset = UtilIT.moveDataset(datasetId.toString(), thiefDataverseAlias, thiefApiToken);
+        thiefAttemptToStealDataset.prettyPrint();
+        thiefAttemptToStealDataset.then().assertThat()
+                .statusCode(UNAUTHORIZED.getStatusCode())
+                .body("message", equalTo("User @" + thiefUsername + " is not permitted to perform requested action."));
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
index f7728a79607..7a29506008a 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java
@@ -19,19 +19,18 @@
 import javax.json.JsonArray;
 import static javax.ws.rs.core.Response.Status.OK;
 import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.NO_CONTENT;
 import org.hamcrest.CoreMatchers;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
 import static junit.framework.Assert.assertEquals;
 import static java.lang.Thread.sleep;
 import static javax.ws.rs.core.Response.Status.CREATED;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import org.hamcrest.Matchers;
 import org.junit.After;
+import static org.junit.Assert.assertNotEquals;
 
 public class SearchIT {
 
@@ -146,6 +145,16 @@ public void testSearchPermisions() throws InterruptedException {
                 .body("data.items[0].name", CoreMatchers.is("Darwin's Finches"))
                 .statusCode(OK.getStatusCode());
 
+        Response publishedDataverseSearchableByAlias = UtilIT.search("dvAlias:" + dataverseAlias, nullToken);
+        publishedDataverseSearchableByAlias.prettyPrint();
+        publishedDataverseSearchableByAlias.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.is(1))
+                .body("data.count_in_response", CoreMatchers.is(1))
+                .body("data.items[0].name", CoreMatchers.is(dataverseAlias))
+                .body("data.items[0].type", CoreMatchers.is("dataverse"))
+                .body("data.items[0].identifier", CoreMatchers.is(dataverseAlias));
+
         Response disableTokenlessSearch = UtilIT.setSetting(SettingsServiceBean.Key.SearchApiRequiresToken, "true");
         disableTokenlessSearch.then().assertThat()
                 .statusCode(OK.getStatusCode());
@@ -210,6 +219,13 @@ public void testSearchCitation() {
 
     }
 
+    /*
+     * Note: this test does a lot of checking for permissions with / without privlidged api key.
+     * Thumbnails access is the same with/without that access as of 4.9.4 --MAD
+     * 
+     * If permissions come into play for thumbnails, the deprecated UtilIT.getInputStreamFromUnirest
+     * should be repaired to actually use api keys
+     */
     @Test
     public void testDatasetThumbnail() {
         logger.info("BEGIN testDatasetThumbnail");
@@ -273,17 +289,27 @@ public void testDatasetThumbnail() {
                 .statusCode(200);
 
         String thumbnailUrl = RestAssured.baseURI + "/api/datasets/" + datasetId + "/thumbnail";
+        
+        File trees = new File("scripts/search/data/binary/trees.png");
+        String treesAsBase64 = null;
+        treesAsBase64 = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(trees, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+
+        if (treesAsBase64 == null) {
+            Logger.getLogger(SearchIT.class.getName()).log(Level.SEVERE, "Failed to generate a base64 thumbnail from the file trees.png");
+        }
+        
         InputStream inputStream1creator = UtilIT.getInputStreamFromUnirest(thumbnailUrl, apiToken);
-        assertNull(inputStream1creator);
+        assertNotEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream1creator));
 
         InputStream inputStream1guest = UtilIT.getInputStreamFromUnirest(thumbnailUrl, noSpecialAcessApiToken);
-        assertNull(inputStream1guest);
+        assertNotEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream1guest));
+ 
 
-        Response getThumbnailImage1 = UtilIT.getDatasetThumbnail(datasetPersistentId, apiToken); //
+        Response getThumbnailImage1 = UtilIT.getDatasetThumbnail(datasetPersistentId, apiToken); 
         getThumbnailImage1.prettyPrint();
         getThumbnailImage1.then().assertThat()
                 .contentType("")
-                .statusCode(NO_CONTENT.getStatusCode());
+                .statusCode(NOT_FOUND.getStatusCode());
 
         Response attemptToGetThumbnailCandidates = UtilIT.showDatasetThumbnailCandidates(datasetPersistentId, noSpecialAcessApiToken);
         attemptToGetThumbnailCandidates.prettyPrint();
@@ -302,7 +328,7 @@ public void testDatasetThumbnail() {
         getThumbnailImageNoAccess1.prettyPrint();
         getThumbnailImageNoAccess1.then().assertThat()
                 .contentType("")
-                .statusCode(NO_CONTENT.getStatusCode());
+                .statusCode(NOT_FOUND.getStatusCode());
 
         Response uploadFile = UtilIT.uploadFile(datasetPersistentId, "trees.zip", apiToken);
         uploadFile.prettyPrint();
@@ -315,14 +341,6 @@ public void testDatasetThumbnail() {
 
         logger.info("DataFile uploaded, should automatically become the thumbnail:");
 
-        File trees = new File("scripts/search/data/binary/trees.png");
-        String treesAsBase64 = null;
-        treesAsBase64 = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(trees, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
-
-        if (treesAsBase64 == null) {
-            Logger.getLogger(SearchIT.class.getName()).log(Level.SEVERE, "Failed to generate a base64 thumbnail from the file trees.png");
-        }
-
         Response search2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken);
         search2.prettyPrint();
         search2.then().assertThat()
@@ -364,8 +382,14 @@ public void testDatasetThumbnail() {
                 .body("data.datasetLogoPresent", CoreMatchers.equalTo(false))
                 .statusCode(200);
 
+        
+        Response getThumbnailImageA = UtilIT.getDatasetThumbnail(datasetPersistentId, apiToken); //
+        getThumbnailImageA.prettyPrint();
+        getThumbnailImageA.then().assertThat()
+                .contentType("image/png")
+                .statusCode(OK.getStatusCode());
+
         InputStream inputStream2creator = UtilIT.getInputStreamFromUnirest(thumbnailUrl, apiToken);
-        assertNotNull(inputStream2creator);
         assertEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream2creator));
 
         InputStream inputStream2guest = UtilIT.getInputStreamFromUnirest(thumbnailUrl, noSpecialAcessApiToken);
@@ -533,12 +557,18 @@ public void testDatasetThumbnail() {
                 .body("data.isUseGenericThumbnail", CoreMatchers.equalTo(true))
                 .body("data.datasetLogoPresent", CoreMatchers.equalTo(false))
                 .statusCode(200);
-
+        
         InputStream inputStream5creator = UtilIT.getInputStreamFromUnirest(thumbnailUrl, apiToken);
-        assertNull(inputStream5creator);
+        assertNotEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream5creator));
 
         InputStream inputStream5guest = UtilIT.getInputStreamFromUnirest(thumbnailUrl, noSpecialAcessApiToken);
-        assertNull(inputStream5guest);
+        assertNotEquals(treesAsBase64, UtilIT.inputStreamToDataUrlSchemeBase64Png(inputStream5guest));
+        
+        Response getThumbnailImageB = UtilIT.getDatasetThumbnail(datasetPersistentId, apiToken); //
+        getThumbnailImageB.prettyPrint();
+        getThumbnailImageB.then().assertThat()
+                .contentType("")
+                .statusCode(NOT_FOUND.getStatusCode());
 
         Response search5 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken);
         search5.prettyPrint();
@@ -647,6 +677,249 @@ public void testIdentifier() {
 
     }
 
+    @Test
+    public void testNestedSubtree() {
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+        
+        //(String alias, String category, String apiToken, String parentDV)
+        Response createDataverseResponse2 = UtilIT.createSubDataverse("subDV" + UtilIT.getRandomIdentifier(), null, apiToken, dataverseAlias);
+        createDataverseResponse2.prettyPrint();
+        String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
+
+        String searchPart = "*"; 
+
+        Response searchUnpublishedSubtree = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
+        searchUnpublishedSubtree.prettyPrint();
+        searchUnpublishedSubtree.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response searchUnpublishedSubtree2 = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias2);
+        searchUnpublishedSubtree2.prettyPrint();
+        searchUnpublishedSubtree2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Response publishDataverse2 = UtilIT.publishDataverseViaNativeApi(dataverseAlias2, apiToken);
+        publishDataverse2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Response searchPublishedSubtree = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
+        searchPublishedSubtree.prettyPrint();
+        searchPublishedSubtree.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1));
+        
+        Response searchPublishedSubtree2 = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias2);
+        searchPublishedSubtree2.prettyPrint();
+        searchPublishedSubtree2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias2, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        System.out.println("id: " + datasetId);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+        System.out.println("datasetPid: " + datasetPid);
+        
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Response searchPublishedSubtreeWDS = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
+        searchPublishedSubtreeWDS.prettyPrint();
+        searchPublishedSubtreeWDS.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(2));
+        
+        Response searchPublishedSubtreeWDS2 = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias2);
+        searchPublishedSubtreeWDS2.prettyPrint();
+        searchPublishedSubtreeWDS2.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1));
+        
+        
+                
+    }
+    
+    @Test
+    public void testSubtreePermissions() {
+
+        Response createUser = UtilIT.createRandomUser();
+        createUser.prettyPrint();
+        String username = UtilIT.getUsernameFromResponse(createUser);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUser);
+
+        Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse.prettyPrint();
+        String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse);
+
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse);
+        System.out.println("id: " + datasetId);
+        String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId");
+        System.out.println("datasetPid: " + datasetPid);
+        
+        Response createDataverseResponse2 = UtilIT.createRandomDataverse(apiToken);
+        createDataverseResponse2.prettyPrint();
+        String dataverseAlias2 = UtilIT.getAliasFromResponse(createDataverseResponse2);
+
+        Response createDatasetResponse2 = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias2, apiToken);
+        createDatasetResponse2.prettyPrint();
+        Integer datasetId2 = UtilIT.getDatasetIdFromResponse(createDatasetResponse2);
+        System.out.println("id: " + datasetId2);
+        String datasetPid2 = JsonPath.from(createDatasetResponse2.getBody().asString()).getString("data.persistentId");
+        System.out.println("datasetPid: " + datasetPid2);
+
+        Response datasetAsJson = UtilIT.nativeGet(datasetId, apiToken);
+        datasetAsJson.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Response datasetAsJson2 = UtilIT.nativeGet(datasetId2, apiToken);
+        datasetAsJson2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        String identifier = JsonPath.from(datasetAsJson.getBody().asString()).getString("data.identifier");
+        String identifier2 = JsonPath.from(datasetAsJson2.getBody().asString()).getString("data.identifier"); 
+
+        String searchPart = "*"; 
+
+        Response searchFakeSubtree = UtilIT.search(searchPart, apiToken, "&subtree=fake");
+        searchFakeSubtree.prettyPrint();
+        searchFakeSubtree.then().assertThat()
+                .statusCode(400);
+        
+        Response searchFakeSubtreeNoAPI = UtilIT.search(searchPart, null, "&subtree=fake");
+        searchFakeSubtreeNoAPI.prettyPrint();
+        searchFakeSubtreeNoAPI.then().assertThat()
+                .statusCode(400);
+        
+        Response searchUnpublishedSubtree = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
+        searchUnpublishedSubtree.prettyPrint();
+        searchUnpublishedSubtree.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response searchUnpublishedSubtreeNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias);
+        searchUnpublishedSubtreeNoAPI.prettyPrint();
+        searchUnpublishedSubtreeNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response searchUnpublishedSubtrees = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias +"&subtree="+dataverseAlias2);
+        searchUnpublishedSubtrees.prettyPrint();
+        searchUnpublishedSubtrees.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find them because they haven't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response searchUnpublishedSubtreesNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias +"&subtree="+dataverseAlias2);
+        searchUnpublishedSubtreesNoAPI.prettyPrint();
+        searchUnpublishedSubtreesNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find them because they haven't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+
+        Response searchUnpublishedRootSubtreeForDataset = UtilIT.search(identifier.replace("FK2/", ""), apiToken, "&subtree=root");
+        searchUnpublishedRootSubtreeForDataset.prettyPrint();
+        searchUnpublishedRootSubtreeForDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+
+        Response searchUnpublishedRootSubtreeForDatasetNoAPI = UtilIT.search(identifier.replace("FK2/", ""), null, "&subtree=root");
+        searchUnpublishedRootSubtreeForDatasetNoAPI.prettyPrint();
+        searchUnpublishedRootSubtreeForDatasetNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response searchUnpublishedNoSubtreeForDataset = UtilIT.search(identifier.replace("FK2/", ""), apiToken, "");
+        searchUnpublishedNoSubtreeForDataset.prettyPrint();
+        searchUnpublishedNoSubtreeForDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        Response searchUnpublishedNoSubtreeForDatasetNoAPI = UtilIT.search(identifier.replace("FK2/", ""), null, "");
+        searchUnpublishedNoSubtreeForDatasetNoAPI.prettyPrint();
+        searchUnpublishedNoSubtreeForDatasetNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                // It's expected that you can't find it because it hasn't been published.
+                .body("data.total_count", CoreMatchers.equalTo(0));
+        
+        //PUBLISH
+        
+        Response publishDataverse = UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken);
+        publishDataverse.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetPid, "major", apiToken);
+        publishDataset.then().assertThat()
+                .statusCode(OK.getStatusCode());
+        
+        Response publishDataverse2 = UtilIT.publishDataverseViaNativeApi(dataverseAlias2, apiToken);
+        publishDataverse2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response publishDataset2 = UtilIT.publishDatasetViaNativeApi(datasetPid2, "major", apiToken);
+        publishDataset2.then().assertThat()
+                .statusCode(OK.getStatusCode());
+
+        Response searchPublishedSubtree = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias);
+        searchPublishedSubtree.prettyPrint();
+        searchPublishedSubtree.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1));
+        
+        Response searchPublishedSubtreeNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias);
+        searchPublishedSubtreeNoAPI.prettyPrint();
+        searchPublishedSubtreeNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1));
+        
+        Response searchPublishedSubtrees = UtilIT.search(searchPart, apiToken, "&subtree="+dataverseAlias+"&subtree="+dataverseAlias2);
+        searchPublishedSubtrees.prettyPrint();
+        searchPublishedSubtrees.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(2));
+        
+        Response searchPublishedSubtreesNoAPI = UtilIT.search(searchPart, null, "&subtree="+dataverseAlias+"&subtree="+dataverseAlias2);
+        searchPublishedSubtreesNoAPI.prettyPrint();
+        searchPublishedSubtreesNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(2));
+        
+        Response searchPublishedRootSubtreeForDataset = UtilIT.search(identifier.replace("FK2/", ""), apiToken, "&subtree=root");
+        searchPublishedRootSubtreeForDataset.prettyPrint();
+        searchPublishedRootSubtreeForDataset.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1));
+        
+        Response searchPublishedRootSubtreeForDatasetNoAPI = UtilIT.search(identifier.replace("FK2/", ""), null, "&subtree=root");
+        searchPublishedRootSubtreeForDatasetNoAPI.prettyPrint();
+        searchPublishedRootSubtreeForDatasetNoAPI.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.total_count", CoreMatchers.equalTo(1));
+    }
+    
     @After
     public void tearDownDataverse() {
         File treesThumb = new File("scripts/search/data/binary/trees.png.thumb48");
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java
new file mode 100644
index 00000000000..723f05d3802
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SiteMapIT.java
@@ -0,0 +1,23 @@
+package edu.harvard.iq.dataverse.api;
+
+import com.jayway.restassured.RestAssured;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import com.jayway.restassured.response.Response;
+
+public class SiteMapIT {
+
+    @BeforeClass
+    public static void setUpClass() {
+        RestAssured.baseURI = UtilIT.getRestAssuredBaseUri();
+    }
+
+    @Test
+    public void testSiteMap() {
+        Response response = UtilIT.sitemapUpdate();
+        response.prettyPrint();
+        Response download = UtilIT.sitemapDownload();
+        download.prettyPrint();
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
index 3ecf61e5b2c..9615eead8fd 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
@@ -501,7 +501,7 @@ public void testCreateDatasetPublishDestroy() {
                 .statusCode(CREATED.getStatusCode());
         String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse);
 
-        String datasetTitle = "Publish or Perist";
+        String datasetTitle = "Publish or Perish";
         Response createDataset = UtilIT.createDatasetViaSwordApi(dataverseAlias, datasetTitle, apiToken);
         createDataset.prettyPrint();
         createDataset.then().assertThat()
@@ -590,7 +590,7 @@ public void testCreateDatasetPublishDestroy() {
         thisDataverseContents.prettyPrint();
         thisDataverseContents.then().assertThat()
                 .statusCode(OK.getStatusCode());
-        logger.info("We expect to find \"" + datasetId + "\" from the persistent ID to be present.");
+        logger.info("We expect to find the numeric id of the dataset (\"" + datasetId + "\") in the response.");
         assertTrue(thisDataverseContents.body().asString().contains(datasetId.toString()));
         
         
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index e9d44246057..15dd5538da5 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -27,19 +27,14 @@
 import edu.harvard.iq.dataverse.util.FileUtil;
 import java.util.Base64;
 import org.apache.commons.io.IOUtils;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.path.xml.XmlPath.from;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static com.jayway.restassured.RestAssured.given;
 import static com.jayway.restassured.path.xml.XmlPath.from;
+import static com.jayway.restassured.RestAssured.given;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -102,7 +97,7 @@ public static Response createRandomUser(String usernamePrefix) {
                 .post("/api/builtin-users?key=" + BUILTIN_USER_KEY + "&password=" + password);
         return response;
     }
-
+    
     public static Response createRandomUser() {
 
         return createRandomUser("user");
@@ -247,7 +242,12 @@ public static Response getServiceDocument(String apiToken) {
         return response;
     }
 
+    //This method creates a dataverse off root, for more nesting use createSubDataverse
     static Response createDataverse(String alias, String category, String apiToken) {
+        return createSubDataverse(alias, category, apiToken, ":root");
+    }
+    
+    static Response createSubDataverse(String alias, String category, String apiToken, String parentDV) {
         JsonArrayBuilder contactArrayBuilder = Json.createArrayBuilder();
         contactArrayBuilder.add(Json.createObjectBuilder().add("contactEmail", getEmailFromUserName(getRandomIdentifier())));
         JsonArrayBuilder subjectArrayBuilder = Json.createArrayBuilder();
@@ -262,7 +262,7 @@ static Response createDataverse(String alias, String category, String apiToken)
                 .build();
         Response createDataverseResponse = given()
                 .body(dvData.toString()).contentType(ContentType.JSON)
-                .when().post("/api/dataverses/:root?key=" + apiToken);
+                .when().post("/api/dataverses/" + parentDV + "?key=" + apiToken);
         return createDataverseResponse;
     }
 
@@ -422,6 +422,14 @@ static Response updateFieldLevelDatasetMetadataViaNative(String persistentId, St
                 .put("/api/datasets/:persistentId/editMetadata/?persistentId=" + persistentId + "&replace=true");
         return response;
     }
+    
+    static Response updateDatasetPIDMetadata(String persistentId,  String apiToken) {
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .contentType("application/json")
+                .post("/api/datasets/:persistentId/modifyRegistrationMetadata/?persistentId=" + persistentId);
+        return response;
+    }
 
     static private String getDatasetXml(String title, String author, String description) {
         String xmlIn = "\n"
@@ -585,6 +593,11 @@ static Response downloadFileOriginal(Integer fileId) {
                 .get("/api/access/datafile/" + fileId + "?format=original");
     }
     
+    static Response downloadTabularFileNoVarHeader(Integer fileId) {
+        return given()
+                .get("/api/access/datafile/" + fileId + "?noVarHeader=true");
+    }
+    
     static Response downloadFileOriginal(Integer fileId, String apiToken) {
         return given()
                 .get("/api/access/datafile/" + fileId + "?format=original&key=" + apiToken);
@@ -848,6 +861,17 @@ static Response publishDatasetViaNativeApiDeprecated(String persistentId, String
                 .urlEncodingEnabled(false)
                 .get("/api/datasets/:persistentId/actions/:publish?type=" + majorOrMinor + "&persistentId=" + persistentId);
     }
+    
+    static Response modifyDatasetPIDMetadataViaApi(String persistentId,  String apiToken) {
+        /**
+         * @todo This should be a POST rather than a GET:
+         * https://github.com/IQSS/dataverse/issues/2431
+         */
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .urlEncodingEnabled(false)
+                .get("/api/datasets/:persistentId/&persistentId=" + persistentId);
+    }
 
     static Response publishDatasetViaNativeApi(Integer datasetId, String majorOrMinor, String apiToken) {
         /**
@@ -1035,6 +1059,86 @@ static Response restrictFile(String fileIdOrPersistentId, boolean restrict, Stri
                 .put("/api/files/" + idInPath + "/restrict" + optionalQueryParam);
         return response;
     }
+    
+    static Response allowAccessRequests(String datasetIdOrPersistentId, boolean allowRequests, String apiToken) {
+        String idInPath = datasetIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isNumber(datasetIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId;
+        }
+        Response response = given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .body(allowRequests)
+                .put("/api/access/" + idInPath + "/allowAccessRequest" + optionalQueryParam);
+        return response;
+    }
+
+    static Response requestFileAccess(String fileIdOrPersistentId, String apiToken) {
+
+        String idInPath = fileIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
+        }
+
+        String keySeparator = "&";
+        if (optionalQueryParam.isEmpty()) {
+            keySeparator = "?";
+        }
+        Response response = given()
+                .put("/api/access/datafile/" + idInPath + "/requestAccess" + optionalQueryParam + keySeparator + "key=" + apiToken);
+        return response;
+    }
+
+    static Response grantFileAccess(String fileIdOrPersistentId, String identifier, String apiToken) {
+        String idInPath = fileIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
+        }
+        String keySeparator = "&";
+        if (optionalQueryParam.isEmpty()) {
+            keySeparator = "?";
+        }
+        Response response = given()
+                .put("/api/access/datafile/" + idInPath + "/grantAccess/" + identifier + "/" + optionalQueryParam + keySeparator + "key=" + apiToken);
+        return response;
+    }
+
+    static Response getAccessRequestList(String fileIdOrPersistentId, String apiToken) {
+        String idInPath = fileIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
+        }
+        String keySeparator = "&";
+        if (optionalQueryParam.isEmpty()) {
+            keySeparator = "?";
+        }
+        Response response = given()
+                .get("/api/access/datafile/" + idInPath + "/listRequests/" + optionalQueryParam + keySeparator + "key=" + apiToken);
+        return response;
+    }
+
+    static Response rejectFileAccessRequest(String fileIdOrPersistentId, String identifier, String apiToken) {
+        String idInPath = fileIdOrPersistentId; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isNumber(fileIdOrPersistentId)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + fileIdOrPersistentId;
+        }
+        String keySeparator = "&";
+        if (optionalQueryParam.isEmpty()) {
+            keySeparator = "?";
+        }
+        Response response = given()
+                .put("/api/access/datafile/" + idInPath + "/rejectAccess/" + identifier + "/" + optionalQueryParam + keySeparator + "key=" + apiToken);
+        return response;
+    }
 
     static Response moveDataverse(String movedDataverseAlias, String targetDataverseAlias, Boolean force, String apiToken) {
         Response response = given()
@@ -1042,6 +1146,28 @@ static Response moveDataverse(String movedDataverseAlias, String targetDataverse
                 .post("api/dataverses/" + movedDataverseAlias + "/move/" + targetDataverseAlias + "?forceMove=" + force + "&key=" + apiToken);
         return response;
     }
+
+    static Response moveDataset(String idOrPersistentIdOfDatasetToMove, String destinationDataverseAlias, String apiToken) {
+        return moveDataset(idOrPersistentIdOfDatasetToMove, destinationDataverseAlias, false, apiToken);
+    }
+
+    private static Response moveDataset(String idOrPersistentIdOfDatasetToMove, String destinationDataverseAlias, boolean force, String apiToken) {
+        if (force) {
+            throw new RuntimeException("FIXME: support force");
+        }
+        String idInPath = idOrPersistentIdOfDatasetToMove; // Assume it's a number.
+        String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path.
+        if (!NumberUtils.isNumber(idOrPersistentIdOfDatasetToMove)) {
+            idInPath = ":persistentId";
+            optionalQueryParam = "?persistentId=" + idOrPersistentIdOfDatasetToMove;
+        }
+        RequestSpecification requestSpecification = given();
+        if (apiToken != null) {
+            requestSpecification = given()
+                    .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
+        }
+        return requestSpecification.post("/api/datasets/" + idInPath + "/move/" + destinationDataverseAlias + optionalQueryParam);
+    }
     
     static Response createDataverseLink(String linkedDataverseAlias, String linkingDataverseAlias, String apiToken) {
         Response response = given()
@@ -1253,14 +1379,18 @@ static Response exportDataset(String datasetPersistentId, String exporter, Strin
                 //                .get("/api/datasets/:persistentId/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter);
                 .get("/api/datasets/export" + "?persistentId=" + datasetPersistentId + "&exporter=" + exporter);
     }
-
-    static Response search(String query, String apiToken) {
+    
+    static Response search(String query, String apiToken, String parameterString) {
         RequestSpecification requestSpecification = given();
         if (apiToken != null) {
             requestSpecification = given()
                     .header(UtilIT.API_TOKEN_HTTP_HEADER, apiToken);
         }
-        return requestSpecification.get("/api/search?q=" + query);
+        return requestSpecification.get("/api/search?q=" + query + parameterString);
+    }
+
+    static Response search(String query, String apiToken) {
+        return search(query, apiToken, "");
     }
 
     static Response searchAndShowFacets(String query, String apiToken) {
@@ -1304,11 +1434,18 @@ static Response setSetting(SettingsServiceBean.Key settingKey, String value) {
 
     static Response getRoleAssignmentsOnDataverse(String dataverseAliasOrId, String apiToken) {
         String url = "/api/dataverses/" + dataverseAliasOrId + "/assignments";
-        System.out.println("URL: " + url);
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .get(url);
     }
+    
+    static Response updateDefaultContributorsRoleOnDataverse(String dataverseAliasOrId,String roleAlias, String apiToken) {
+        String url = "/api/dataverses/" + dataverseAliasOrId + "/defaultContributorRole/" + roleAlias;
+        System.out.println("URL: " + url);
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .put(url);
+    }
 
     static Response getRoleAssignmentsOnDataset(String datasetId, String persistentId, String apiToken) {
         String url = "/api/datasets/" + datasetId + "/assignments";
@@ -1330,6 +1467,13 @@ static Response revokeRole(String definitionPoint, long doomed, String apiToken)
                 .header(API_TOKEN_HTTP_HEADER, apiToken)
                 .delete("api/dataverses/" + definitionPoint + "/assignments/" + doomed);
     }
+    
+    static Response revokeFileAccess(String definitionPoint, String doomed, String apiToken) {
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .delete("api/access/datafile/" + definitionPoint + "/revokeAccess/" + doomed);
+    }
+    
 
     static Response findPermissionsOn(String dvObject, String apiToken) {
         return given()
@@ -1389,8 +1533,9 @@ static Response setDataverseLogo(String dataverseAlias, String pathToImageFile,
     }
 
     /**
-     * @todo figure out how to get an InputStream from REST Assured instead.
+     * Deprecated as the apiToken is not used by the call.
      */
+    @Deprecated
     static InputStream getInputStreamFromUnirest(String url, String apiToken) {
         GetRequest unirestOut = Unirest.get(url);
         try {
@@ -1560,7 +1705,6 @@ static Response metricsDataversesToMonth(String yyyymm) {
             optionalYyyyMm = "/" + yyyymm;
         }
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/dataverses/toMonth" + optionalYyyyMm);
     }
 
@@ -1570,7 +1714,6 @@ static Response metricsDatasetsToMonth(String yyyymm) {
             optionalYyyyMm = "/" + yyyymm;
         }
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/datasets/toMonth" + optionalYyyyMm);
     }
 
@@ -1580,7 +1723,6 @@ static Response metricsFilesToMonth(String yyyymm) {
             optionalYyyyMm = "/" + yyyymm;
         }
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/files/toMonth" + optionalYyyyMm);
     }
 
@@ -1590,28 +1732,59 @@ static Response metricsDownloadsToMonth(String yyyymm) {
             optionalYyyyMm = "/" + yyyymm;
         }
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/downloads/toMonth" + optionalYyyyMm);
     }
+    
+    static Response metricsDataversesPastDays(String days) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/dataverses/pastDays/" + days);
+    }
+    
+    static Response metricsDatasetsPastDays(String days) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/datasets/pastDays/" + days);
+    }
+        
+    static Response metricsFilesPastDays(String days) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/files/pastDays/" + days);
+    }
+            
+    static Response metricsDownloadsPastDays(String days) {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/downloads/pastDays/" + days);
+    }
 
-    static Response metricsDataverseByCategory() {
+    static Response metricsDataversesByCategory() {
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/dataverses/byCategory");
     }
+    
+    static Response metricsDataversesBySubject() {
+        RequestSpecification requestSpecification = given();
+        return requestSpecification.get("/api/info/metrics/dataverses/bySubject");
+    }
 
     static Response metricsDatasetsBySubject() {
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.get("/api/info/metrics/datasets/bySubject");
     }
     
     static Response clearMetricCache() {
         RequestSpecification requestSpecification = given();
-        requestSpecification = given();
         return requestSpecification.delete("/api/admin/clearMetricsCache");
     }
 
+    static Response sitemapUpdate() {
+        return given()
+                .post("/api/admin/sitemap");
+    }
+
+    static Response sitemapDownload() {
+        return given()
+                .get("/sitemap.xml");
+    }
+
     @Test
     public void testGetFileIdFromSwordStatementWithNoFiles() {
         String swordStatementWithNoFiles = "\n"
diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java
index 52dc67f2034..ebf22f9dcb4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinAuthenticationProviderTest.java
@@ -124,8 +124,8 @@ public void testVerifyPassword() {
     @Test
     public void testAuthenticate() {
         bean.save(makeBuiltInUser());
-        String crdUsername = sut.getRequiredCredentials().get(0).getTitle();
-        String crdPassword = sut.getRequiredCredentials().get(1).getTitle();
+        String crdUsername = sut.getRequiredCredentials().get(0).getKey();
+        String crdPassword = sut.getRequiredCredentials().get(1).getKey();
         AuthenticationRequest req = new AuthenticationRequest();
         req.putCredential(crdUsername, "username");
         req.putCredential(crdPassword, "password");
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
new file mode 100644
index 00000000000..4ce821a5fee
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIOTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2018 Forschungszentrum Jülich GmbH
+ * SPDX-License-Identifier: Apache 2.0
+ */
+package edu.harvard.iq.dataverse.dataaccess;
+
+import com.amazonaws.services.s3.AmazonS3;
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.api.UtilIT;
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import static org.junit.jupiter.api.Assertions.*;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.mockito.Mockito.*;
+import static org.mockito.BDDMockito.*;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.STRICT_STUBS)
+public class S3AccessIOTest {
+    
+    @Mock
+    private AmazonS3 s3client;
+    
+    private S3AccessIO dataSetAccess;
+    private S3AccessIO dataFileAccess;
+    private Dataset dataSet;
+    private DataFile dataFile;
+    private String dataFileId;
+    
+    @BeforeEach
+    public void setup() throws IOException {
+        dataFile = MocksFactory.makeDataFile();
+        dataSet = MocksFactory.makeDataset();
+        dataFile.setOwner(dataSet);
+        dataFileId = UtilIT.getRandomIdentifier();
+        dataFile.setStorageIdentifier("s3://bucket:"+dataFileId);
+        dataSetAccess = new S3AccessIO<>(dataSet, null, s3client);
+        dataFileAccess = new S3AccessIO<>(dataFile, null, s3client);
+    }
+    
+    /*
+    createTempFile
+    getStorageLocation
+    getFileSystemPath
+    exists?
+    getWriteChannel
+    getOutputStream
+    getDestinationKey
+    
+    DONE
+    ---------------------
+    getMainFileKey
+    getUrlExpirationMinutes
+     */
+    
+    @Test
+    void keyNull_getMainFileKey() throws IOException {
+        // given
+        String authOwner = dataSet.getAuthority();
+        String idOwner = dataSet.getIdentifier();
+        
+        // when
+        String key = dataFileAccess.getMainFileKey();
+        
+        // then
+        assertEquals(authOwner+"/"+idOwner+"/"+dataFileId, key);
+    }
+    
+    @Test
+    void keyNullstorageIdNullOrEmpty_getMainFileKey() throws IOException {
+        // given
+        dataFile.setStorageIdentifier(null);
+        // when & then
+        assertThrows(FileNotFoundException.class, () -> {dataFileAccess.getMainFileKey(); });
+    
+        // given
+        dataFile.setStorageIdentifier("");
+        // when & then
+        assertThrows(FileNotFoundException.class, () -> {dataFileAccess.getMainFileKey(); });
+    }
+    
+    @Test
+    void keyNullstorageIdNull_getMainFileKey() throws IOException {
+        // given
+        dataFile.setStorageIdentifier("invalid://abcd");
+        // when & then
+        assertThrows(IOException.class, () -> {dataFileAccess.getMainFileKey(); });
+    }
+    
+    @Test
+    void default_getUrlExpirationMinutes() {
+        // given
+        System.clearProperty("dataverse.files.s3-url-expiration-minutes");
+        // when & then
+        assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
+    }
+    
+    @Test
+    void validSetting_getUrlExpirationMinutes() {
+        // given
+        System.setProperty("dataverse.files.s3-url-expiration-minutes", "120");
+        // when & then
+        assertEquals(120, dataFileAccess.getUrlExpirationMinutes());
+    }
+    
+    @Test
+    void invalidSetting_getUrlExpirationMinutes() {
+        // given
+        System.setProperty("dataverse.files.s3-url-expiration-minutes", "NaN");
+        // when & then
+        assertEquals(60, dataFileAccess.getUrlExpirationMinutes());
+    }
+    
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
index 70dbc11db29..9f6f8236dce 100644
--- a/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/dataaccess/StorageIOTest.java
@@ -5,7 +5,6 @@
  */
 package edu.harvard.iq.dataverse.dataaccess;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
@@ -18,6 +17,7 @@
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.nio.channels.Channel;
+import java.util.Arrays;
 import java.util.List;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -32,7 +32,7 @@ public class StorageIOTest {
     StorageIO instance = new FileAccessIO<>();
 
     @Test
-    public void testGetChannel() throws FileNotFoundException {
+    public void testGetChannel() throws IOException {
         assertEquals(null, instance.getChannel());
         Channel c = new RandomAccessFile("src/main/java/Bundle.properties", "r").getChannel();
         instance.setChannel(c);
@@ -104,7 +104,7 @@ public void testSize() {
     }
 
     @Test
-    public void testInputStream() {
+    public void testInputStream() throws IOException {
         assertEquals(null, instance.getInputStream());
         InputStream is = new ByteArrayInputStream("Test".getBytes());
         instance.setInputStream(is);
diff --git a/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java
index 08b020ec2ca..a00daef63c2 100644
--- a/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/datacapturemodule/DataCaptureModuleUtilTest.java
@@ -3,6 +3,7 @@
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeAuthenticatedUser;
 import java.io.UnsupportedEncodingException;
@@ -26,10 +27,10 @@ public void testRsyncSupportEnabled() {
         System.out.println("rsyncSupportEnabled");
         assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled(null));
         assertEquals(true, DataCaptureModuleUtil.rsyncSupportEnabled("dcm/rsync+ssh"));
-        // We haven't finalized what the separator will be yet.
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("NATIVE:dcm/rsync+ssh"));
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("NATIVE,dcm/rsync+ssh"));
-        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("NATIVE"));
+        // Comma sepratated lists of upload methods are supported.
+        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("native/http:dcm/rsync+ssh"));
+        assertEquals(true, DataCaptureModuleUtil.rsyncSupportEnabled("native/http,dcm/rsync+ssh"));
+        assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("native/http"));
         assertEquals(false, DataCaptureModuleUtil.rsyncSupportEnabled("junk"));
     }
 
@@ -105,4 +106,14 @@ public void testGetMessageFromException() {
         assertEquals("edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleException", DataCaptureModuleUtil.getMessageFromException(new DataCaptureModuleException(null, null)));
         assertEquals("edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleException: message1", DataCaptureModuleUtil.getMessageFromException(new DataCaptureModuleException("message1", null)));
     }
+
+    @Test
+    public void testScriptName() {
+        DatasetVersion datasetVersion = new DatasetVersion();
+        Dataset dataset = new Dataset();
+        dataset.setIdentifier("KYHURW");
+        datasetVersion.setDataset(dataset);
+        assertEquals("upload-KYHURW.bash", DataCaptureModuleUtil.getScriptName(datasetVersion));
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
index 8b76055db06..310b10dde22 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java
@@ -3,10 +3,12 @@
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
+import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.authorization.groups.impl.explicit.ExplicitGroupServiceBean;
 import edu.harvard.iq.dataverse.datacapturemodule.DataCaptureModuleServiceBean;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
 import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
+import edu.harvard.iq.dataverse.pidproviders.FakePidProviderServiceBean;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
 import edu.harvard.iq.dataverse.search.IndexBatchServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
@@ -123,6 +125,11 @@ public DOIDataCiteServiceBean doiDataCite() {
         return null;
     }
 
+    @Override
+    public FakePidProviderServiceBean fakePidProvider() {
+        return null;
+    }
+
     @Override
     public HandlenetServiceBean handleNet() {
         return null;
@@ -172,6 +179,11 @@ public DataFileServiceBean files() {
     public ExplicitGroupServiceBean explicitGroups() {
         return null;
     }
+    
+    @Override
+    public GroupServiceBean groups() {
+        return null;
+    }
 
     @Override
     public RoleAssigneeServiceBean roleAssignees() {
@@ -212,4 +224,9 @@ public MapLayerMetadataServiceBean mapLayerMetadata() {
     public DataCaptureModuleServiceBean dataCaptureModule() {
         return null;
     }
+    
+    @Override
+    public FileDownloadServiceBean fileDownload() {
+        return null;
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java
index 0c95fb951ed..34f03702243 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/MoveDatasetCommandTest.java
@@ -8,14 +8,19 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
+import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.Guestbook;
 import edu.harvard.iq.dataverse.GuestbookResponse;
 import edu.harvard.iq.dataverse.GuestbookServiceBean;
 import edu.harvard.iq.dataverse.MetadataBlock;
+import edu.harvard.iq.dataverse.PermissionServiceBean;
+import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.engine.DataverseEngine;
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
+import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
@@ -48,6 +53,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -196,6 +202,22 @@ public EntityManager em() {
 
                 };
             }
+
+            @Override
+            public PermissionServiceBean permissions() {
+                return new PermissionServiceBean() {
+
+                    @Override
+                    public boolean isUserAllowedOn(RoleAssignee roleAssignee, Command command, DvObject dvObject) {
+                        AuthenticatedUser authenticatedUser = (AuthenticatedUser) roleAssignee;
+                        if (authenticatedUser.getFirstName().equals("Super")) {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }
+                };
+            }
             
         });
     }
@@ -271,15 +293,35 @@ public void testInvalidMove() throws Exception {
         fail();
     }
         
-        /**
-	 * Moving DS Without Being Super User
-         * Fails due to Permission Exception
-        * @throws java.lang.Exception
-	 */
+    /**
+     * Moving a dataset without having enough permission fails with
+     * PermissionException.
+     *
+     * @throws java.lang.Exception
+     * 
+     * Ignoring after permissions change in 47fb045. Did that change make this
+     * case untestable? Unclear.
+     */
+    @Ignore
     @Test(expected = PermissionException.class)
-    public void testNotSuperUser() throws Exception {
+    public void testAuthenticatedUserWithNoRole() throws Exception {
 
         DataverseRequest aRequest = new DataverseRequest(nobody, httpRequest);
+        testEngine.submit(
+                new MoveDatasetCommand(aRequest, moved, childA, null));
+        fail();
+    }
+
+    /**
+     * Moving a dataset without being an AuthenticatedUser fails with
+     * PermissionException.
+     *
+     * @throws java.lang.Exception
+     */
+    @Test(expected = PermissionException.class)
+    public void testNotAuthenticatedUser() throws Exception {
+
+        DataverseRequest aRequest = new DataverseRequest(GuestUser.get(), httpRequest);
         testEngine.submit(
                 new MoveDatasetCommand(aRequest, moved, root, null));
         fail();
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java
index 6181da666a5..1e8b8fb3106 100644
--- a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RestrictFileCommandTest.java
@@ -7,6 +7,7 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion.VersionState;
 import edu.harvard.iq.dataverse.FileMetadata;
 import edu.harvard.iq.dataverse.engine.TestCommandContext;
 import edu.harvard.iq.dataverse.engine.TestDataverseEngine;
@@ -36,6 +37,7 @@ public class RestrictFileCommandTest {
     private DataFile file;
     private Dataset dataset;
     boolean restrict = true;
+    boolean unrestrict = false;
     static boolean publicInstall = false;
     
     
@@ -89,19 +91,33 @@ public void testRestrictUnpublishedFile() throws CommandException{
     
     @Test
     public void testRestrictPublishedFile() throws Exception{
-        file.setOwner(dataset);
         dataset.setPublicationDate(new Timestamp(new Date().getTime()));
+        // Restrict on a published file will cause the creation of a new draft dataset version
+        // and should update only the FileMetadata in the draft version for the test file.
+        // So we need to make sure that we use one of the files in the dataset for the test 
+        DataFile file = dataset.getFiles().get(0);
+        // And make sure is is file.isReleased() == true
+        file.setPublicationDate(dataset.getPublicationDate());
+        // And set its owner, which is usually done automatically, but not in the test setup
+        file.setOwner(dataset);
+        //And set the version state to released so that the RestrictFileCommand will create a draft version
+        dataset.getLatestVersion().setVersionState(VersionState.RELEASED);
         RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), restrict);
         engine.submit(cmd);
 
         //asserts
         assertTrue(!file.isRestricted());
+        boolean fileFound = false;
         for (FileMetadata fmw : dataset.getEditVersion().getFileMetadatas()) {
             if (file.equals(fmw.getDataFile())) {
-                assertEquals(fmw, file.getFileMetadata());
+                fileFound=true;
+                //If it worked fmw is for the draft version and file.getFileMetadata() is for the published version
                 assertTrue(fmw.isRestricted());
+                assertTrue(!file.getFileMetadata().isRestricted());
+                break;
             }
         }
+        assertTrue(fileFound);
     }
     
     
@@ -131,6 +147,106 @@ public void testRestrictRestrictedFile() throws Exception {
         
     }
     
+    @Test
+    public void testRestrictRestrictedNewFile() throws Exception {
+        String expected = "File " + file.getDisplayName() + " is already restricted";
+        String actual = null;
+        file.setRestricted(true);
+        file.getFileMetadata().setRestricted(restrict);
+        RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), restrict);
+        try {
+            engine.submit(cmd);
+        } catch (CommandException ex) {
+            actual = ex.getMessage();
+        }
+        
+        assertEquals(expected, actual);
+        
+    }
+
+    
+    @Test
+    public void testUnrestrictUnpublishedFile() throws CommandException{
+        file.setOwner(dataset);
+        file.setRestricted(true);
+        file.getFileMetadata().setRestricted(true);
+        RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), unrestrict);
+        engine.submit(cmd);
+        
+        assertTrue(!file.isRestricted());
+        assertTrue(!file.getFileMetadata().isRestricted());
+        
+    }
+    
+    @Test
+    public void testUnrestrictPublishedFile() throws Exception{
+        //see comments in testRestrictPublishedFile()
+        dataset.setPublicationDate(new Timestamp(new Date().getTime()));
+        DataFile file = dataset.getFiles().get(0);
+        file.setOwner(dataset);
+        file.setPublicationDate(dataset.getPublicationDate());
+        file.setRestricted(true);
+        file.getFileMetadata().setRestricted(true);
+        dataset.getLatestVersion().setVersionState(VersionState.RELEASED);
+        RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), unrestrict);
+        engine.submit(cmd);
+        //asserts
+        assertTrue(file.isRestricted());
+        boolean fileFound = false;
+        for (FileMetadata fmw : dataset.getEditVersion().getFileMetadatas()) {
+            if (file.equals(fmw.getDataFile())) {
+                fileFound = true;
+                assertTrue(!fmw.isRestricted());
+                assertTrue(file.getFileMetadata().isRestricted());
+                break;
+            }
+        }
+        assertTrue(fileFound);
+    }
+    
+    
+    @Test
+    public void testUnrestrictNewFile() throws Exception {
+        file.setRestricted(true);
+        file.getFileMetadata().setRestricted(true);
+        RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), unrestrict);
+        engine.submit(cmd);
+        assertTrue(!file.isRestricted());
+        assertTrue(!file.getFileMetadata().isRestricted());
+    }
+    
+    @Test
+    public void testUnrestrictUnrestrictedFile() throws Exception {
+        file.setOwner(dataset);
+        String expected = "File " + file.getDisplayName() + " is already unrestricted";
+        String actual = null;
+        RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), unrestrict);
+        try {
+            engine.submit(cmd);
+        } catch (CommandException ex) {
+            actual = ex.getMessage();
+        }
+        
+        assertEquals(expected, actual);
+        
+    }
+    
+    @Test
+    public void testUnrestrictUnrestrictedNewFile() throws Exception {
+        
+        String expected = "File " + file.getDisplayName() + " is already unrestricted";
+        String actual = null;
+        RestrictFileCommand cmd = new RestrictFileCommand(file, makeRequest(), unrestrict);
+        try {
+            engine.submit(cmd);
+        } catch (CommandException ex) {
+            actual = ex.getMessage();
+        }
+        
+        assertEquals(expected, actual);
+        
+    }
+
     @Test 
     public void testPublicInstall() throws CommandException {
         file.setOwner(dataset);
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
index a24f99ccf8a..a21ddc0e604 100644
--- a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
@@ -1,22 +1,30 @@
 package edu.harvard.iq.dataverse.export;
 
 import edu.harvard.iq.dataverse.ControlledVocabularyValue;
+import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetFieldType;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.FileMetadata;
+import edu.harvard.iq.dataverse.TermsOfUseAndAccess;
 import static edu.harvard.iq.dataverse.util.SystemConfig.SITE_URL;
+import static edu.harvard.iq.dataverse.util.SystemConfig.FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS;
 import edu.harvard.iq.dataverse.util.json.JsonParser;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.PrintWriter;
 import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import javax.json.Json;
 import javax.json.JsonObject;
@@ -28,6 +36,9 @@
 import org.junit.Test;
 import static org.junit.Assert.*;
 
+/**
+ * For docs see {@link SchemaDotOrgExporter}.
+ */
 public class SchemaDotOrgExporterTest {
 
     private final SchemaDotOrgExporter schemaDotOrgExporter;
@@ -88,6 +99,19 @@ public void setUp() {
         dsDescriptionType.setChildDatasetFieldTypes(dsDescriptionTypes);
 
         DatasetFieldType keywordType = datasetFieldTypeSvc.add(new DatasetFieldType("keyword", DatasetFieldType.FieldType.TEXT, true));
+        Set keywordChildTypes = new HashSet<>();
+        keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordValue", DatasetFieldType.FieldType.TEXT, false)));
+        keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordVocabulary", DatasetFieldType.FieldType.TEXT, false)));
+        keywordChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("keywordVocabularyURI", DatasetFieldType.FieldType.TEXT, false)));
+        keywordType.setChildDatasetFieldTypes(keywordChildTypes);
+
+        DatasetFieldType topicClassificationType = datasetFieldTypeSvc.add(new DatasetFieldType("topicClassification", DatasetFieldType.FieldType.TEXT, true));
+        Set topicClassificationTypes = new HashSet<>();
+        topicClassificationTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("topicClassValue", DatasetFieldType.FieldType.TEXT, false)));
+        topicClassificationTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("topicClassVocab", DatasetFieldType.FieldType.TEXT, false)));
+        topicClassificationTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("topicClassVocabURI", DatasetFieldType.FieldType.TEXT, false)));
+        topicClassificationType.setChildDatasetFieldTypes(topicClassificationTypes);
+
         DatasetFieldType descriptionType = datasetFieldTypeSvc.add(new DatasetFieldType("description", DatasetFieldType.FieldType.TEXTBOX, false));
 
         DatasetFieldType subjectType = datasetFieldTypeSvc.add(new DatasetFieldType("subject", DatasetFieldType.FieldType.TEXT, true));
@@ -115,6 +139,82 @@ public void setUp() {
             t.setParentDatasetFieldType(compoundSingleType);
         }
         compoundSingleType.setChildDatasetFieldTypes(childTypes);
+
+        DatasetFieldType contributorType = datasetFieldTypeSvc.add(new DatasetFieldType("contributor", DatasetFieldType.FieldType.TEXT, true));
+        Set contributorChildTypes = new HashSet<>();
+        contributorChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("contributorName", DatasetFieldType.FieldType.TEXT, false)));
+        DatasetFieldType contributorTypes = datasetFieldTypeSvc.add(new DatasetFieldType("contributorType", DatasetFieldType.FieldType.TEXT, false));
+        contributorTypes.setAllowControlledVocabulary(true);
+        contributorTypes.setControlledVocabularyValues(Arrays.asList(
+                // Why aren't these enforced?
+                new ControlledVocabularyValue(1l, "Data Collector", contributorTypes),
+                new ControlledVocabularyValue(2l, "Data Curator", contributorTypes),
+                new ControlledVocabularyValue(3l, "Data Manager", contributorTypes),
+                new ControlledVocabularyValue(3l, "Editor", contributorTypes),
+                new ControlledVocabularyValue(3l, "Funder", contributorTypes),
+                new ControlledVocabularyValue(3l, "Hosting Institution", contributorTypes)
+        // Etc. There are more.
+        ));
+        contributorChildTypes.add(datasetFieldTypeSvc.add(contributorTypes));
+        for (DatasetFieldType t : contributorChildTypes) {
+            t.setParentDatasetFieldType(contributorType);
+        }
+        contributorType.setChildDatasetFieldTypes(contributorChildTypes);
+
+        DatasetFieldType grantNumberType = datasetFieldTypeSvc.add(new DatasetFieldType("grantNumber", DatasetFieldType.FieldType.TEXT, true));
+        Set grantNumberChildTypes = new HashSet<>();
+        grantNumberChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("grantNumberAgency", DatasetFieldType.FieldType.TEXT, false)));
+        grantNumberChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("grantNumberValue", DatasetFieldType.FieldType.TEXT, false)));
+        grantNumberType.setChildDatasetFieldTypes(grantNumberChildTypes);
+
+        DatasetFieldType publicationType = datasetFieldTypeSvc.add(new DatasetFieldType("publication", DatasetFieldType.FieldType.TEXT, true));
+        Set publicationChildTypes = new HashSet<>();
+        publicationChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("publicationCitation", DatasetFieldType.FieldType.TEXT, false)));
+        DatasetFieldType publicationIdTypes = datasetFieldTypeSvc.add(new DatasetFieldType("publicationIDType", DatasetFieldType.FieldType.TEXT, false));
+        publicationIdTypes.setAllowControlledVocabulary(true);
+        publicationIdTypes.setControlledVocabularyValues(Arrays.asList(
+                // Why aren't these enforced?
+                new ControlledVocabularyValue(1l, "ark", publicationIdTypes),
+                new ControlledVocabularyValue(2l, "arXiv", publicationIdTypes),
+                new ControlledVocabularyValue(3l, "bibcode", publicationIdTypes),
+                new ControlledVocabularyValue(4l, "doi", publicationIdTypes),
+                new ControlledVocabularyValue(5l, "ean13", publicationIdTypes),
+                new ControlledVocabularyValue(6l, "handle", publicationIdTypes)
+        // Etc. There are more.
+        ));
+        publicationChildTypes.add(datasetFieldTypeSvc.add(publicationIdTypes));
+        publicationChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("publicationIDNumber", DatasetFieldType.FieldType.TEXT, false)));
+        DatasetFieldType publicationURLType = new DatasetFieldType("publicationURL", DatasetFieldType.FieldType.URL, false);
+        publicationURLType.setDisplayFormat("#VALUE");
+        publicationChildTypes.add(datasetFieldTypeSvc.add(publicationURLType));
+        publicationType.setChildDatasetFieldTypes(publicationChildTypes);
+
+        DatasetFieldType timePeriodCoveredType = datasetFieldTypeSvc.add(new DatasetFieldType("timePeriodCovered", DatasetFieldType.FieldType.NONE, true));
+        Set timePeriodCoveredChildTypes = new HashSet<>();
+        timePeriodCoveredChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("timePeriodCoveredStart", DatasetFieldType.FieldType.DATE, false)));
+        timePeriodCoveredChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("timePeriodCoveredEnd", DatasetFieldType.FieldType.DATE, false)));
+        timePeriodCoveredType.setChildDatasetFieldTypes(timePeriodCoveredChildTypes);
+
+        DatasetFieldType geographicCoverageType = datasetFieldTypeSvc.add(new DatasetFieldType("geographicCoverage", DatasetFieldType.FieldType.TEXT, true));
+        Set geographicCoverageChildTypes = new HashSet<>();
+        DatasetFieldType countries = datasetFieldTypeSvc.add(new DatasetFieldType("country", DatasetFieldType.FieldType.TEXT, false));
+        countries.setAllowControlledVocabulary(true);
+        countries.setControlledVocabularyValues(Arrays.asList(
+                // Why aren't these enforced?
+                new ControlledVocabularyValue(1l, "Afghanistan", countries),
+                new ControlledVocabularyValue(2l, "Albania", countries)
+        // And many more countries.
+        ));
+        geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(countries));
+        geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("state", DatasetFieldType.FieldType.TEXT, false)));
+        geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("city", DatasetFieldType.FieldType.TEXT, false)));
+        geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("otherGeographicCoverage", DatasetFieldType.FieldType.TEXT, false)));
+        geographicCoverageChildTypes.add(datasetFieldTypeSvc.add(new DatasetFieldType("geographicUnit", DatasetFieldType.FieldType.TEXT, false)));
+        for (DatasetFieldType t : geographicCoverageChildTypes) {
+            t.setParentDatasetFieldType(geographicCoverageType);
+        }
+        geographicCoverageType.setChildDatasetFieldTypes(geographicCoverageChildTypes);
+
     }
 
     @After
@@ -127,7 +227,7 @@ public void tearDown() {
     @Test
     public void testExportDataset() throws Exception {
         System.out.println("exportDataset");
-        File datasetVersionJson = new File("src/test/resources/json/dataset-finch1.json");
+        File datasetVersionJson = new File("src/test/resources/json/dataset-finch2.json");
         String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
 
         JsonReader jsonReader1 = Json.createReader(new StringReader(datasetVersionAsJson));
@@ -139,40 +239,112 @@ public void testExportDataset() throws Exception {
         Date publicationDate = dateFmt.parse("19551105");
         version.setReleaseTime(publicationDate);
         version.setVersionNumber(1l);
-        // TODO: It might be nice to test TermsOfUseAndAccess some day
-        version.setTermsOfUseAndAccess(null);
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setLicense(TermsOfUseAndAccess.License.CC0);
+        version.setTermsOfUseAndAccess(terms);
+
         Dataset dataset = new Dataset();
         dataset.setProtocol("doi");
-        dataset.setAuthority("myAuthority");
-        dataset.setIdentifier("myIdentifier");
+        dataset.setAuthority("10.5072/FK2");
+        dataset.setIdentifier("IMK5A4");
+        dataset.setPublicationDate(new Timestamp(publicationDate.getTime()));
         version.setDataset(dataset);
         Dataverse dataverse = new Dataverse();
         dataverse.setName("LibraScholar");
         dataset.setOwner(dataverse);
         System.setProperty(SITE_URL, "https://librascholar.org");
+        boolean hideFileUrls = false;
+        if (hideFileUrls) {
+            System.setProperty(FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS, "true");
+        }
+
+        FileMetadata fmd = new FileMetadata();
+        DataFile dataFile = new DataFile();
+        dataFile.setId(42l);
+        dataFile.setFilesize(1234);
+        dataFile.setContentType("text/plain");
+        dataFile.setProtocol("doi");
+        dataFile.setAuthority("10.5072/FK2");
+        dataFile.setIdentifier("7V5MPI");
+        fmd.setDatasetVersion(version);
+        fmd.setDataFile(dataFile);
+        fmd.setLabel("README.md");
+        fmd.setDescription("README file.");
+        List fileMetadatas = new ArrayList<>();
+        fileMetadatas.add(fmd);
+        dataFile.setFileMetadatas(fileMetadatas);;
+        dataFile.setOwner(dataset);
+        version.setFileMetadatas(fileMetadatas);
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         schemaDotOrgExporter.exportDataset(version, json1, byteArrayOutputStream);
         String jsonLd = byteArrayOutputStream.toString();
-        System.out.println("schema.org JSON-LD: " + JsonUtil.prettyPrint(jsonLd));
+        String prettyJson = JsonUtil.prettyPrint(jsonLd);
+        System.out.println("schema.org JSON-LD: " + prettyJson);
         JsonReader jsonReader2 = Json.createReader(new StringReader(jsonLd));
         JsonObject json2 = jsonReader2.readObject();
         assertEquals("http://schema.org", json2.getString("@context"));
         assertEquals("Dataset", json2.getString("@type"));
-        assertEquals("https://doi.org/myAuthority/myIdentifier", json2.getString("identifier"));
+        assertEquals("https://doi.org/10.5072/FK2/IMK5A4", json2.getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/IMK5A4", json2.getString("identifier"));
         assertEquals("Darwin's Finches", json2.getString("name"));
+        assertEquals("Finch, Fiona", json2.getJsonArray("creator").getJsonObject(0).getString("name"));
+        assertEquals("Birds Inc.", json2.getJsonArray("creator").getJsonObject(0).getString("affiliation"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("@id"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("creator").getJsonObject(0).getString("identifier"));
         assertEquals("Finch, Fiona", json2.getJsonArray("author").getJsonObject(0).getString("name"));
         assertEquals("Birds Inc.", json2.getJsonArray("author").getJsonObject(0).getString("affiliation"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("@id"));
+        assertEquals("https://orcid.org/0000-0002-1825-0097", json2.getJsonArray("author").getJsonObject(0).getString("identifier"));
+        assertEquals("1955-11-05", json2.getString("datePublished"));
         assertEquals("1955-11-05", json2.getString("dateModified"));
         assertEquals("1", json2.getString("version"));
-        assertEquals("Darwin's finches (also known as the Galápagos finches) are a group of about fifteen species of passerine birds.", json2.getString("description"));
+        assertEquals("Darwin's finches (also known as the Galápagos finches) are a group of about fifteen species of passerine birds.", json2.getJsonArray("description").getString(0));
+        assertEquals("Bird is the word.", json2.getJsonArray("description").getString(1));
+        assertEquals(2, json2.getJsonArray("description").size());
         assertEquals("Medicine, Health and Life Sciences", json2.getJsonArray("keywords").getString(0));
-        assertEquals("https://schema.org/version/3.3", json2.getString("schemaVersion"));
+        assertEquals("tcTerm1", json2.getJsonArray("keywords").getString(1));
+        assertEquals("KeywordTerm1", json2.getJsonArray("keywords").getString(2));
+        assertEquals("KeywordTerm2", json2.getJsonArray("keywords").getString(3));
+        // This dataset, for example, has multiple keywords separated by commas: https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/24034&version=2.0
+        assertEquals("keywords, with, commas", json2.getJsonArray("keywords").getString(4));
+        assertEquals("CreativeWork", json2.getJsonArray("citation").getJsonObject(0).getString("@type"));
+        assertEquals("Finch, Fiona 2018. \"The Finches.\" American Ornithological Journal 60 (4): 990-1005.", json2.getJsonArray("citation").getJsonObject(0).getString("text"));
+        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/RV16HK", json2.getJsonArray("citation").getJsonObject(0).getString("identifier"));
+        assertEquals("2002/2005", json2.getJsonArray("temporalCoverage").getString(0));
+        assertEquals("2001-10-01/2015-11-15", json2.getJsonArray("temporalCoverage").getString(1));
+        assertEquals(null, json2.getString("schemaVersion", null));
+        assertEquals("Dataset", json2.getJsonObject("license").getString("@type"));
+        assertEquals("CC0", json2.getJsonObject("license").getString("text"));
+        assertEquals("https://creativecommons.org/publicdomain/zero/1.0/", json2.getJsonObject("license").getString("url"));
         assertEquals("DataCatalog", json2.getJsonObject("includedInDataCatalog").getString("@type"));
         assertEquals("LibraScholar", json2.getJsonObject("includedInDataCatalog").getString("name"));
         assertEquals("https://librascholar.org", json2.getJsonObject("includedInDataCatalog").getString("url"));
+        assertEquals("Organization", json2.getJsonObject("publisher").getString("@type"));
+        assertEquals("LibraScholar", json2.getJsonObject("provider").getString("name"));
         assertEquals("Organization", json2.getJsonObject("provider").getString("@type"));
-        assertEquals("Dataverse", json2.getJsonObject("provider").getString("name"));
+        assertEquals("LibraScholar", json2.getJsonObject("provider").getString("name"));
+        assertEquals("Organization", json2.getJsonArray("funder").getJsonObject(0).getString("@type"));
+        assertEquals("National Science Foundation", json2.getJsonArray("funder").getJsonObject(0).getString("name"));
+        // The NIH grant number is not shown because don't have anywhere in schema.org to put it. :(
+        assertEquals("National Institutes of Health", json2.getJsonArray("funder").getJsonObject(1).getString("name"));
+        assertEquals(2, json2.getJsonArray("funder").size());
+        assertEquals("Columbus, Ohio, United States, North America", json2.getJsonArray("spatialCoverage").getString(0));
+        assertEquals("Wisconsin, United States", json2.getJsonArray("spatialCoverage").getString(1));
+        assertEquals(2, json2.getJsonArray("spatialCoverage").size());
+        assertEquals("DataDownload", json2.getJsonArray("distribution").getJsonObject(0).getString("@type"));
+        assertEquals("README.md", json2.getJsonArray("distribution").getJsonObject(0).getString("name"));
+        assertEquals("text/plain", json2.getJsonArray("distribution").getJsonObject(0).getString("fileFormat"));
+        assertEquals(1234, json2.getJsonArray("distribution").getJsonObject(0).getInt("contentSize"));
+        assertEquals("README file.", json2.getJsonArray("distribution").getJsonObject(0).getString("description"));
+        assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("@id"));
+        assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("identifier"));
+        assertEquals("https://librascholar.org/api/access/datafile/42", json2.getJsonArray("distribution").getJsonObject(0).getString("contentUrl"));
+        assertEquals(1, json2.getJsonArray("distribution").size());
+        try (PrintWriter printWriter = new PrintWriter("/tmp/dvjsonld.json")) {
+            printWriter.println(prettyJson);
+        }
     }
 
     /**
diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java
new file mode 100644
index 00000000000..cb0655c068f
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestFrequencyTest.java
@@ -0,0 +1,195 @@
+package edu.harvard.iq.dataverse.ingest;
+
+import edu.harvard.iq.dataverse.DataFile;
+import edu.harvard.iq.dataverse.DataTable;
+import edu.harvard.iq.dataverse.datavariable.VariableCategory;
+import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataFileReader;
+import edu.harvard.iq.dataverse.ingest.tabulardata.TabularDataIngest;
+
+import org.junit.Test;
+
+import javax.ejb.EJB;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.BufferedInputStream;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class IngestFrequencyTest {
+
+    @EJB
+    IngestServiceBean ingestService;
+
+    @Test
+    /**
+     * Test calculation of frequencies during ingest
+     */
+
+    public void testFrequency()  {
+
+        String fileNameSav = "src/test/resources/sav/frequency-test.sav";
+        DataFile dataFile = readFileCalcFreq(fileNameSav , "application/x-spss-sav" );
+
+        assertNotNull(dataFile);
+
+        long varQuant = dataFile.getDataTable().getVarQuantity();
+        assertEquals(varQuant, 3);
+
+        Collection cats1 = dataFile.getDataTable().getDataVariables().get(0).getCategories();
+        assertEquals(cats1.size(),2);
+        firstVariableTest(cats1);
+
+        Collection cats2 = dataFile.getDataTable().getDataVariables().get(1).getCategories();
+        assertEquals(cats2.size(),4);
+        secondVariableTest(cats2);
+
+        Collection cats3 = dataFile.getDataTable().getDataVariables().get(2).getCategories();
+        assertEquals(cats3.size(),2);
+        thirdVariableTest(cats3);
+
+        DataFile dataFileDta = readFileCalcFreq("src/test/resources/dta/test_cat_values.dta" , "application/x-stata-14" );
+        assertNotNull(dataFileDta);
+
+        long varQuantDta = dataFileDta.getDataTable().getVarQuantity();
+        assertEquals(varQuantDta, 1);
+
+        Collection cats = dataFileDta.getDataTable().getDataVariables().get(0).getCategories();
+        assertEquals(cats.size(),2);
+        dtaVariableTest(cats);
+
+        return;
+    }
+
+    private void dtaVariableTest(Collection cats) {
+        for (VariableCategory cat : cats) {
+            double freq = cat.getFrequency();
+            switch (cat.getLabel()) {
+                case "Urban":
+                    assertEquals((int) 6, (int) freq);
+                    break;
+                case "Rural":
+                    assertEquals((int) 4, (int)freq);
+                    break;
+                default:
+                    System.out.println("Thire is no such category label " + cat.getLabel());
+                    assertEquals(0,1);
+            }
+        }
+    }
+
+    private DataFile readFileCalcFreq(String fileName, String type ) {
+
+        BufferedInputStream fileInputStream = null;
+
+        try {
+            fileInputStream = new BufferedInputStream(new FileInputStream(new File(fileName)));
+        } catch (FileNotFoundException notfoundEx) {
+            System.out.println("Cannot find file " + fileName);
+            fileInputStream = null;
+            assertNotNull(fileInputStream);
+        }
+
+        TabularDataFileReader ingestPlugin = ingestService.getTabDataReaderByMimeType(type);
+        assertNotNull(ingestPlugin);
+
+        TabularDataIngest tabDataIngest = null;
+
+        try {
+            tabDataIngest = ingestPlugin.read(fileInputStream, null);
+        } catch (IOException ingestEx) {
+            tabDataIngest = null;
+            System.out.println("Caught an exception trying to ingest file " + fileName + ": " + ingestEx.getLocalizedMessage());
+            assertNotNull(tabDataIngest);
+        }
+
+        File tabFile = tabDataIngest.getTabDelimitedFile();
+
+        assertNotNull(tabDataIngest.getDataTable());
+        assertNotNull(tabFile);
+        assertNotNull(tabFile.exists());
+
+
+        DataTable dataTable = tabDataIngest.getDataTable();
+        DataFile dataFile = new DataFile();
+
+        dataFile.setDataTable(dataTable);
+        dataTable.setDataFile(dataFile);
+
+        try {
+            ingestService.produceFrequencyStatistics(dataFile, tabFile);
+            return dataFile;
+        } catch (IOException ioex) {
+            System.out.println("Caught exception during  produceFrequencyStatistics with " + ioex.getMessage());
+            assertEquals(0, 1);
+            return null;
+        }
+    }
+
+
+
+    private void firstVariableTest(Collection cats) {
+        for (VariableCategory cat : cats) {
+            double freq = cat.getFrequency();
+            switch (cat.getLabel()) {
+                case "Male":
+                    assertEquals((int) 1537, (int) freq);
+                    break;
+                case "Female":
+                    assertEquals((int) 1508, (int)freq);
+                    break;
+                default:
+                    System.out.println("Thire is no such category label " + cat.getLabel());
+                    assertEquals(0,1);
+            }
+        }
+    }
+
+    private void secondVariableTest(Collection cats) {
+        for (VariableCategory cat : cats) {
+            double freq = cat.getFrequency();
+            switch (cat.getValue()) {
+                case "1":
+                    assertEquals((int) 0, (int) freq);
+                    break;
+                case "2":
+                    assertEquals((int) 691, (int)freq);
+                    break;
+                case "3":
+                    assertEquals((int) 1262, (int)freq);
+                    break;
+                case "4":
+                    assertEquals((int) 1092, (int)freq);
+                    break;
+                default:
+                    System.out.println("There is no such category value " + cat.getValue());
+                    assertEquals(0,1);
+
+            }
+        }
+    }
+
+    private void thirdVariableTest(Collection cats) {
+        for (VariableCategory cat : cats) {
+            String c = cat.getValue();
+
+            double freq = cat.getFrequency();
+            switch (c) {
+                case "1":
+                    assertEquals((int) 2497, (int) freq);
+                    break;
+                case "2":
+                    assertEquals((int) 548, (int)freq);
+                    break;
+                default:
+                    System.out.println("There is no such category value " + cat.getValue());
+                    assertEquals(0,1);
+
+            }
+        }
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java
index 87c963f5ef2..0ef71eb7514 100644
--- a/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/metrics/MetricsUtilTest.java
@@ -90,6 +90,45 @@ public void testDatasetsBySubjectToJson() {
         assertEquals("Physics", jsonObject.getString("subject"));
         assertEquals(98, jsonObject.getInt("count"));
     }
+    
+    @Test
+    public void testDataversesBySubjectToJson() {
+         List list = new ArrayList<>();
+        Object[] obj00 = {"Social Sciences", 24955l};
+        Object[] obj01 = {"Medicine, Health and Life Sciences", 2262l};
+        Object[] obj02 = {"Earth and Environmental Sciences", 1631l};
+        Object[] obj03 = {"Agricultural Sciences", 1187l};
+        Object[] obj04 = {"Other", 980l};
+        Object[] obj05 = {"Computer and Information Science", 888l};
+        Object[] obj06 = {"Arts and Humanities", 832l};
+        Object[] obj07 = {"Astronomy and Astrophysics", 353l};
+        Object[] obj08 = {"Business and Management", 346l};
+        Object[] obj09 = {"Law", 220l};
+        Object[] obj10 = {"Engineering", 203l};
+        Object[] obj11 = {"Mathematical Sciences", 123l};
+        Object[] obj12 = {"Chemistry", 116l};
+        Object[] obj13 = {"Physics", 98l};
+        list.add(obj00);
+        list.add(obj01);
+        list.add(obj02);
+        list.add(obj03);
+        list.add(obj04);
+        list.add(obj05);
+        list.add(obj06);
+        list.add(obj07);
+        list.add(obj08);
+        list.add(obj09);
+        list.add(obj10);
+        list.add(obj11);
+        list.add(obj12);
+        list.add(obj13);
+        JsonArrayBuilder jab = MetricsUtil.dataversesBySubjectToJson(list);
+        JsonArray jsonArray = jab.build();
+        System.out.println(JsonUtil.prettyPrint(jsonArray));
+        JsonObject jsonObject = jsonArray.getJsonObject(13);
+        assertEquals("Physics", jsonObject.getString("subject"));
+        assertEquals(98, jsonObject.getInt("count"));
+    }
 
     @Test
     public void testSanitizeHappyPath() throws Exception {
diff --git a/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java b/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java
index a2ecfa77cc5..efa83fbb950 100644
--- a/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/provenance/ProvInvestigatorTest.java
@@ -120,9 +120,6 @@ public void testProvNamesNotInsideEntity() throws IOException {
         assertFalse(entities.size() > 0); 
     }
     
-    //MAD: write a simple entity test as well, also ensure logging works after getting a real tostring together
-    //also write a test of parsing different cases, we don't want to catch "fakename" but we do want to catch "rdt:name" and "name"
-    
     @Category(NonEssentialTests.class)
     @Test
     public void testProvNameJsonParserEmptyEntities() throws IOException {
diff --git a/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java
new file mode 100644
index 00000000000..f5f1bf056f6
--- /dev/null
+++ b/src/test/java/edu/harvard/iq/dataverse/sitemap/SiteMapUtilTest.java
@@ -0,0 +1,114 @@
+package edu.harvard.iq.dataverse.sitemap;
+
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.Dataverse;
+import edu.harvard.iq.dataverse.GlobalId;
+import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
+import edu.harvard.iq.dataverse.util.xml.XmlPrinter;
+import edu.harvard.iq.dataverse.util.xml.XmlValidator;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
+public class SiteMapUtilTest {
+
+    @Test
+    public void testUpdateSiteMap() throws IOException, ParseException {
+
+        List dataverses = new ArrayList<>();
+        String publishedDvString = "publishedDv1";
+        Dataverse publishedDataverse = new Dataverse();
+        publishedDataverse.setAlias(publishedDvString);
+        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date dvModifiedDate = dateFmt.parse("1955-11-12 22:04:00");
+        publishedDataverse.setModificationTime(new Timestamp(dvModifiedDate.getTime()));
+        publishedDataverse.setPublicationDate(new Timestamp(dvModifiedDate.getTime()));
+        dataverses.add(publishedDataverse);
+
+        List datasets = new ArrayList<>();
+
+        Dataset published = new Dataset();
+        String publishedPid = "doi:10.666/FAKE/published1";
+        published.setGlobalId(new GlobalId(publishedPid));
+        published.setPublicationDate(new Timestamp(new Date().getTime()));
+        published.setModificationTime(new Timestamp(new Date().getTime()));
+        datasets.add(published);
+
+        Dataset unpublished = new Dataset();
+        String unpublishedPid = "doi:10.666/FAKE/unpublished1";
+        unpublished.setGlobalId(new GlobalId(unpublishedPid));
+        Timestamp nullPublicationDateToIndicateNotPublished = null;
+        unpublished.setPublicationDate(nullPublicationDateToIndicateNotPublished);
+        datasets.add(unpublished);
+
+        Dataset harvested = new Dataset();
+        String harvestedPid = "doi:10.666/FAKE/harvested1";
+        harvested.setGlobalId(new GlobalId(harvestedPid));
+        harvested.setPublicationDate(new Timestamp(new Date().getTime()));
+        harvested.setHarvestedFrom(new HarvestingClient());
+        datasets.add(harvested);
+
+        Dataset deaccessioned = new Dataset();
+        String deaccessionedPid = "doi:10.666/FAKE/harvested1";
+        deaccessioned.setGlobalId(new GlobalId(deaccessionedPid));
+        deaccessioned.setPublicationDate(new Timestamp(new Date().getTime()));
+        List datasetVersions = new ArrayList<>();
+        DatasetVersion datasetVersion = new DatasetVersion();
+        datasetVersion.setVersionState(DatasetVersion.VersionState.DEACCESSIONED);
+        datasetVersions.add(datasetVersion);
+        deaccessioned.setVersions(datasetVersions);
+        datasets.add(deaccessioned);
+
+        File oldSitemapFile = new File("/tmp/sitemap.xml");
+        if (oldSitemapFile.exists()) {
+            oldSitemapFile.delete();
+        }
+        SiteMapUtil.updateSiteMap(dataverses, datasets);
+
+        Exception wellFormedXmlException = null;
+        try {
+            assertTrue(XmlValidator.validateXmlWellFormed("/tmp/sitemap.xml"));
+        } catch (Exception ex) {
+            System.out.println("Exception caught checking that XML is well formed: " + ex);
+            wellFormedXmlException = ex;
+        }
+        assertNull(wellFormedXmlException);
+
+        Exception notValidAgainstSchemaException = null;
+        try {
+            assertTrue(XmlValidator.validateXmlSchema("/tmp/sitemap.xml", new URL("https://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd")));
+        } catch (MalformedURLException | SAXException ex) {
+            System.out.println("Exception caught validating XML against the sitemap schema: " + ex);
+            notValidAgainstSchemaException = ex;
+        }
+        assertNull(notValidAgainstSchemaException);
+
+        File sitemapFile = new File("/tmp/sitemap.xml");
+        String sitemapString = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(sitemapFile.getAbsolutePath()))));
+        System.out.println("sitemap: " + sitemapString);
+
+        assertTrue(sitemapString.contains("1955-11-12"));
+        assertTrue(sitemapString.contains(publishedPid));
+        assertFalse(sitemapString.contains(unpublishedPid));
+        assertFalse(sitemapString.contains(harvestedPid));
+        assertFalse(sitemapString.contains(deaccessionedPid));
+
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
index d25659274c2..29556bfa0bf 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
@@ -70,5 +71,21 @@ public void testGetStringFromBundleWithArgumentsAndSpecificBundle() {
         assertEquals(null, BundleUtil.getStringFromBundle(null, null, null));
         assertEquals("Search", BundleUtil.getStringFromBundle("search", null, ResourceBundle.getBundle("Bundle", Locale.US)));
     }
+    
+    @Test
+    public void testStringFromPropertyFile() {
+        assertEquals("ZIP", BundleUtil.getStringFromPropertyFile("application/zip","MimeTypeFacets"));
+    }
 
+    //To assure that the MissingResourceException bubble up from this call
+    @Test(expected = MissingResourceException.class)
+    public void testStringFromPropertyFileException() {
+        BundleUtil.getStringFromPropertyFile("FAKE","MimeTypeFacets");
+    }
+    
+    //To assure MissingResourceException is caught when calling normal bundle calls
+    @Test
+    public void testNoErrorNonExistentStringBundle() {
+        BundleUtil.getStringFromBundle("FAKE", null, BundleUtil.getResourceBundle("MimeTypeFacets")); 
+    }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java
index 69df80b1d4d..dc36b197c55 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/BriefJsonPrinterTest.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.util.json;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetFieldConstant;
@@ -12,6 +11,9 @@
 import edu.harvard.iq.dataverse.workflow.Workflow;
 import javax.json.JsonObject;
 import org.junit.Test;
+
+import java.util.Collections;
+
 import static org.junit.Assert.*;
 
 /**
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
index acf349295bc..4bc06ba042b 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
@@ -101,8 +101,6 @@ public void setUp() {
             t.setParentDatasetFieldType(compoundSingleType);
         }
         compoundSingleType.setChildDatasetFieldTypes(childTypes);
-//        settingsSvc = new JsonParserTest.MockSettingsSvc();
-//        jsonPrinter = new JsonPrinter(settingsSvc);
     }
 
     @Test
@@ -170,7 +168,6 @@ public void testGetFileCategories() {
         assertEquals("Data", jsonObject.getJsonArray("categories").getString(0));
         assertEquals("", jsonObject.getJsonObject("dataFile").getString("filename"));
         assertEquals(-1, jsonObject.getJsonObject("dataFile").getInt("filesize"));
-        assertEquals("UNKNOWN", jsonObject.getJsonObject("dataFile").getString("originalFormatLabel"));
         assertEquals(-1, jsonObject.getJsonObject("dataFile").getInt("rootDataFileId"));
         assertEquals("Survey", jsonObject.getJsonObject("dataFile").getJsonArray("tabularTags").getString(0));
     }
@@ -197,9 +194,9 @@ public void testDatasetContactOutOfBoxNoPrivacy() {
         fields.add(datasetContactField);
 
         SettingsServiceBean nullServiceBean = null;
-        JsonPrinter jsonPrinter = new JsonPrinter(nullServiceBean);
-
-        JsonObject jsonObject = jsonPrinter.json(block, fields).build();
+        JsonPrinter.setSettingsService(nullServiceBean);
+        
+        JsonObject jsonObject = JsonPrinter.json(block, fields).build();
         assertNotNull(jsonObject);
 
         System.out.println("json: " + JsonUtil.prettyPrint(jsonObject.toString()));
@@ -208,7 +205,7 @@ public void testDatasetContactOutOfBoxNoPrivacy() {
         assertEquals("Bar University", jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactAffiliation").getString("value"));
         assertEquals("foo@bar.com", jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactEmail").getString("value"));
 
-        JsonObject byBlocks = jsonPrinter.jsonByBlocks(fields).build();
+        JsonObject byBlocks = JsonPrinter.jsonByBlocks(fields).build();
 
         System.out.println("byBlocks: " + JsonUtil.prettyPrint(byBlocks.toString()));
         assertEquals("Foo Bar", byBlocks.getJsonObject("citation").getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactName").getString("value"));
@@ -238,7 +235,7 @@ public void testDatasetContactWithPrivacy() {
         datasetContactField.setDatasetFieldCompoundValues(vals);
         fields.add(datasetContactField);
 
-        JsonPrinter jsonPrinter = new JsonPrinter(new MockSettingsSvc());
+        JsonPrinter.setSettingsService(new MockSettingsSvc());
 
         JsonObject jsonObject = JsonPrinter.json(block, fields).build();
         assertNotNull(jsonObject);
@@ -249,7 +246,7 @@ public void testDatasetContactWithPrivacy() {
         assertEquals("Bar University", jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactAffiliation").getString("value"));
         assertEquals(null, jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactEmail"));
 
-        JsonObject byBlocks = jsonPrinter.jsonByBlocks(fields).build();
+        JsonObject byBlocks = JsonPrinter.jsonByBlocks(fields).build();
 
         System.out.println("byBlocks: " + JsonUtil.prettyPrint(byBlocks.toString()));
         assertEquals("Foo Bar", byBlocks.getJsonObject("citation").getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactName").getString("value"));
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java
index 2d9c31305d5..af0c657a1a4 100644
--- a/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/util/xml/XmlValidatorTest.java
@@ -16,7 +16,8 @@ public class XmlValidatorTest {
 
     private static final Logger logger = Logger.getLogger(XmlValidatorTest.class.getCanonicalName());
 
-    // FIXME: Remove @Ignore after figuring out why `mvn` (but not NetBeans) shows "javax.xml.transform.TransformerException: org.xml.sax.SAXParseException; Premature end of file"
+    //Ignored as this relies on an external resource that has been down occasionally. 
+    //May be a good test for our full vs. everytime test classifications (#4896) -MAD 4.9.1
     @Ignore
     @Category(NonEssentialTests.class)
     @Test
diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java
index ff1209862c4..27a88260870 100644
--- a/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/validation/PasswordValidatorTest.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.validation;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -10,6 +9,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Logger;
diff --git a/src/test/resources/dta/test_cat_values.dta b/src/test/resources/dta/test_cat_values.dta
new file mode 100644
index 00000000000..52a9b8bb08e
Binary files /dev/null and b/src/test/resources/dta/test_cat_values.dta differ
diff --git a/src/test/resources/json/dataset-finch2.json b/src/test/resources/json/dataset-finch2.json
new file mode 100644
index 00000000000..b3c01eb3d82
--- /dev/null
+++ b/src/test/resources/json/dataset-finch2.json
@@ -0,0 +1,354 @@
+{
+  "datasetVersion": {
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "Darwin's Finches",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              {
+                "authorName": {
+                  "value": "Finch, Fiona",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                "authorIdentifierScheme": {
+                  "typeName": "authorIdentifierScheme",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "ORCID"
+                },
+                "authorIdentifier": {
+                  "typeName": "authorIdentifier",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "0000-0002-1825-0097"
+                },
+                "authorAffiliation": {
+                  "value": "Birds Inc.",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [
+              {
+                "datasetContactEmail": {
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "datasetContactEmail",
+                  "value": "finch@mailinator.com"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "datasetContact"
+          },
+          {
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "value": "Darwin's finches (also known as the Galápagos finches) are a group of about fifteen species of passerine birds.",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "dsDescriptionValue"
+                }
+              },
+              {
+                "dsDescriptionValue": {
+                  "value": "Bird is the word.",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "dsDescriptionValue"
+                }
+              }
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "dsDescription"
+          },
+          {
+            "value": [
+              "Medicine, Health and Life Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          },
+          {
+            "typeName": "keyword",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm1"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary1"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL1.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordTerm2"
+                },
+                "keywordVocabulary": {
+                  "typeName": "keywordVocabulary",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "KeywordVocabulary2"
+                },
+                "keywordVocabularyURI": {
+                  "typeName": "keywordVocabularyURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://KeywordVocabularyURL2.org"
+                }
+              },
+              {
+                "keywordValue": {
+                  "typeName": "keywordValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "keywords, with, commas"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "topicClassification",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "topicClassValue": {
+                  "typeName": "topicClassValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "tcTerm1"
+                },
+                "topicClassVocab": {
+                  "typeName": "topicClassVocab",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "tcVocab1"
+                },
+                "topicClassVocabURI": {
+                  "typeName": "topicClassVocabURI",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "http://example.com/tcTerm1"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "contributor",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Data Collector"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Holmes, Sherlock"
+                }
+              },
+              {
+                "contributorType": {
+                  "typeName": "contributorType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "Funder"
+                },
+                "contributorName": {
+                  "typeName": "contributorName",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "National Science Foundation"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "grantNumber",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "grantNumberAgency": {
+                  "typeName": "grantNumberAgency",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "National Institutes of Health"
+                },
+                "grantNumberValue": {
+                  "typeName": "grantNumberValue",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "1245"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "publication",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "publicationCitation": {
+                  "typeName": "publicationCitation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Finch, Fiona 2018. \"The Finches.\" American Ornithological Journal 60 (4): 990-1005."
+                },
+                "publicationIDType": {
+                  "typeName": "publicationIDType",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "doi"
+                },
+                "publicationIDNumber": {
+                  "typeName": "publicationIDNumber",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "10.5072/FK2/RV16HK"
+                },
+                "publicationURL": {
+                  "typeName": "publicationURL",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "https://doi.org/10.5072/FK2/RV16HK"
+                }
+              }
+            ]
+          },
+          {
+            "typeName": "timePeriodCovered",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2002"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2005"
+                }
+              },
+              {
+                "timePeriodCoveredStart": {
+                  "typeName": "timePeriodCoveredStart",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2001-10-01"
+                },
+                "timePeriodCoveredEnd": {
+                  "typeName": "timePeriodCoveredEnd",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "2015-11-15"
+                }
+              }
+            ]
+          }
+        ],
+        "displayName": "Citation Metadata"
+      },
+      "geospatial": {
+        "displayName": "Geospatial Metadata",
+        "fields": [
+          {
+            "typeName": "geographicCoverage",
+            "multiple": true,
+            "typeClass": "compound",
+            "value": [
+              {
+                "city": {
+                  "typeName": "city",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Columbus"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Ohio"
+                },
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "United States"
+                },
+                "otherGeographicCoverage": {
+                  "typeName": "otherGeographicCoverage",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "North America"
+                }
+              },
+              {
+                "country": {
+                  "typeName": "country",
+                  "multiple": false,
+                  "typeClass": "controlledVocabulary",
+                  "value": "United States"
+                },
+                "state": {
+                  "typeName": "state",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "Wisconsin"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/src/test/resources/sav/frequency-test.sav b/src/test/resources/sav/frequency-test.sav
new file mode 100644
index 00000000000..36e913b075d
Binary files /dev/null and b/src/test/resources/sav/frequency-test.sav differ