merge-update from trunk

[cdmlib.git] / cdmlib-persistence / src / test / resources / dbscripts / 001-cdm.h2.sql

diff --git a/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql b/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql
index e1ea247262b510e6ab17ec0364dd280c2fe1dd74..8918572cadaf79a9a0fd517b3af0b28301b2d8c1 100644 (file)
--- a/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -221,18 +221,18 @@ CREATE CACHED TABLE PUBLIC.AGENTBASE_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.AGENTBASE_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.AGENTBASE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.AGENTBASE_RIGHTSINFO(
     AGENTBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.AGENTBASE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.AGENTBASE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.AGENTBASE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.AGENTBASE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     AGENTBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.AGENTBASE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.AGENTBASE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.AGENTBASE_CONTACT_EMAILADDRESSES(
     AGENTBASE_ID INTEGER NOT NULL,
     CONTACT_EMAILADDRESSES_ELEMENT VARCHAR(255)
@@ -303,7 +303,7 @@ CREATE TABLE AMPLIFICATION (
      CLONING_ID INTEGER,
      DNASAMPLE_ID INTEGER,
      FORWARDPRIMER_ID INTEGER,
-     MARKER_ID INTEGER,
+     DNAMARKER_ID INTEGER,
      PURIFICATION_ID INTEGER,
      REVERSEPRIMER_ID INTEGER,
      GELPHOTO_ID INTEGER,
@@ -333,7 +333,7 @@ CREATE TABLE AMPLIFICATION_AUD (
     CLONING_ID INTEGER,
     DNASAMPLE_ID INTEGER,
     FORWARDPRIMER_ID INTEGER,
-    MARKER_ID INTEGER,
+    DNAMARKER_ID INTEGER,
     PURIFICATION_ID INTEGER,
     REVERSEPRIMER_ID INTEGER,
     GELPHOTO_ID INTEGER,
@@ -366,17 +366,17 @@ CREATE TABLE AMPLIFICATION_MARKER_AUD (
     MARKERS_ID INTEGER NOT NULL,
 );
 
-CREATE TABLE AMPLIFICATION_SINGLESEQUENCE (
+CREATE TABLE AMPLIFICATION_SINGLEREAD (
        AMPLIFICATION_ID INTEGER NOT NULL,
-    SINGLESEQUENCES_ID INTEGER NOT NULL,
-    PRIMARY KEY (AMPLIFICATION_ID, SINGLESEQUENCES_ID)
+    SINGLEREADS_ID INTEGER NOT NULL,
+    PRIMARY KEY (AMPLIFICATION_ID, SINGLEREADS_ID)
 );
 
-CREATE TABLE AMPLIFICATION_SINGLESEQUENCE_AUD (
+CREATE TABLE AMPLIFICATION_SINGLEREAD_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
        AMPLIFICATION_ID INTEGER NOT NULL,
-    SINGLESEQUENCES_ID INTEGER NOT NULL,
+    SINGLEREADS_ID INTEGER NOT NULL,
 );
 
 CREATE CACHED TABLE PUBLIC.ANNOTATION(
@@ -387,7 +387,7 @@ CREATE CACHED TABLE PUBLIC.ANNOTATION(
     TEXT CLOB,
     ANNOTATEDOBJ_TYPE VARCHAR(255),
     ANNOTATEDOBJ_ID INTEGER NOT NULL,
-    LINKBACKURL BINARY(255),
+    LINKBACKURI CLOB,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     LANGUAGE_ID INTEGER,
@@ -403,7 +403,7 @@ CREATE CACHED TABLE PUBLIC.ANNOTATION_AUD(
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
     TEXT CLOB,
-    LINKBACKURL BINARY(255),
+    LINKBACKURI CLOB,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     LANGUAGE_ID INTEGER,
@@ -466,12 +466,12 @@ CREATE CACHED TABLE PUBLIC.CDMMETADATA(
     CREATEDBY_ID INTEGER
 );
 -- 3 +/- SELECT COUNT(*) FROM PUBLIC.CDMMETADATA;
-CREATE CACHED TABLE PUBLIC.CDMPREFERENCES(
-    SUBJECT VARCHAR(255),
-    PREDICATE VARCHAR(255),
+CREATE CACHED TABLE PUBLIC.CDMPREFERENCE(
+    KEY_SUBJECT VARCHAR(100),
+    KEY_PREDICATE VARCHAR(100),
     VALUE VARCHAR(1023)
 );
--- 3 +/- SELECT COUNT(*) FROM PUBLIC.CDMMETADATA;
+-- 3 +/- SELECT COUNT(*) FROM PUBLIC.CDMPREFERENCE;
 CREATE CACHED TABLE PUBLIC.CLASSIFICATION(
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
@@ -488,7 +488,8 @@ CREATE CACHED TABLE PUBLIC.CLASSIFICATION(
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     NAME_ID INTEGER,
-    REFERENCE_ID INTEGER
+    REFERENCE_ID INTEGER,
+    ROOTNODE_ID INTEGER
 );
 -- 1 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION;
 CREATE CACHED TABLE PUBLIC.CLASSIFICATION_AUD(
@@ -509,7 +510,8 @@ CREATE CACHED TABLE PUBLIC.CLASSIFICATION_AUD(
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     NAME_ID INTEGER,
-    REFERENCE_ID INTEGER
+    REFERENCE_ID INTEGER,
+    ROOTNODE_ID INTEGER
 );
 -- 1 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_AUD;
 CREATE CACHED TABLE PUBLIC.CLASSIFICATION_ANNOTATION(
@@ -574,97 +576,19 @@ CREATE CACHED TABLE PUBLIC.CLASSIFICATION_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.CLASSIFICATION_RIGHTS(
+CREATE CACHED TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO(
     CLASSIFICATION_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_RIGHTS;
-CREATE CACHED TABLE PUBLIC.CLASSIFICATION_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     CLASSIFICATION_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_RIGHTS_AUD;
-CREATE CACHED TABLE PUBLIC.CLASSIFICATION_TAXONNODE(
-    CLASSIFICATION_ID INTEGER NOT NULL,
-    ROOTNODES_ID INTEGER NOT NULL
-);
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_TAXONNODE;
-CREATE CACHED TABLE PUBLIC.CLASSIFICATION_TAXONNODE_AUD(
-    REV INTEGER NOT NULL,
-    CLASSIFICATION_ID INTEGER NOT NULL,
-    ROOTNODES_ID INTEGER NOT NULL,
-    REVTYPE TINYINT
-);
-
-CREATE TABLE PUBLIC.CLONING (
-       ID INTEGER NOT NULL,
-    CREATED TIMESTAMP,
-    UUID VARCHAR(36),
-    UPDATED TIMESTAMP,
-    DESCRIPTION VARCHAR(255),
-    TIMEPERIOD_END VARCHAR(255),
-    TIMEPERIOD_FREETEXT VARCHAR(255),
-    TIMEPERIOD_START VARCHAR(255),
-       METHOD BINARY(255),
-    STRAIN VARCHAR(255),
-    CREATEDBY_ID INTEGER,
-    UPDATEDBY_ID INTEGER,
-    ACTOR_ID INTEGER,
-    FORWARDPRIMER_ID INTEGER,
-    REVERSEPRIMER_ID INTEGER,
-    PRIMARY KEY (ID)
-    );
-
-CREATE TABLE PUBLIC.CLONING_AUD (
-       ID INTEGER NOT NULL,
-    REV INTEGER NOT NULL,
-    REVTYPE TINYINT,
-    CREATED TIMESTAMP,
-    UUID VARCHAR(36),
-    UPDATED TIMESTAMP,
-    DESCRIPTION VARCHAR(255),
-    TIMEPERIOD_END VARCHAR(255),
-    TIMEPERIOD_FREETEXT VARCHAR(255),
-    TIMEPERIOD_START VARCHAR(255),
-       METHOD BINARY(255),
-    STRAIN VARCHAR(255),
-    CREATEDBY_ID INTEGER,
-    UPDATEDBY_ID INTEGER,
-    ACTOR_ID INTEGER,
-    FORWARDPRIMER_ID INTEGER,
-    REVERSEPRIMER_ID INTEGER
-);
-
-
-CREATE TABLE PUBLIC.CLONING_ANNOTATION (
-    CLONING_ID INTEGER NOT NULL,
-    ANNOTATIONS_ID INTEGER NOT NULL,
-    PRIMARY KEY (CLONING_ID, ANNOTATIONS_ID)
-);
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_RIGHTSINFO_AUD;
 
-CREATE TABLE PUBLIC.CLONING_ANNOTATION_AUD (
-    REV INTEGER NOT NULL,
-    REVTYPE TINYINT,
-    CLONING_ID INTEGER NOT NULL,
-    ANNOTATIONS_ID INTEGER NOT NULL
-);
-
-CREATE TABLE PUBLIC.CLONING_MARKER (
-    CLONING_ID INTEGER NOT NULL,
-    MARKERS_ID INTEGER NOT NULL,
-    PRIMARY KEY (CLONING_ID, MARKERS_ID)
-);
-
-CREATE TABLE PUBLIC.CLONING_MARKER_AUD (
-    REV INTEGER NOT NULL,
-    REVTYPE TINYINT,
-    CLONING_ID INTEGER NOT NULL,
-    MARKERS_ID INTEGER NOT NULL
-);
-
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.CLASSIFICATION_TAXONNODE_AUD;
 CREATE CACHED TABLE PUBLIC.COLLECTION(
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
@@ -786,18 +710,18 @@ CREATE CACHED TABLE PUBLIC.COLLECTION_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.COLLECTION_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.COLLECTION_RIGHTS(
+CREATE CACHED TABLE PUBLIC.COLLECTION_RIGHTSINFO(
     COLLECTION_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.COLLECTION_RIGHTS;
-CREATE CACHED TABLE PUBLIC.COLLECTION_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.COLLECTION_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.COLLECTION_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     COLLECTION_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.COLLECTION_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.COLLECTION_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.CREDIT(
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
@@ -856,7 +780,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    TERMTYPE INTEGER,
+    TERMTYPE VARCHAR(4),
     IDINVOCABULARY VARCHAR(255),
     LSID_AUTHORITY VARCHAR(255),
     LSID_LSID VARCHAR(255),
@@ -867,7 +791,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE(
     TITLECACHE VARCHAR(255),
     URI CLOB,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     ISTECHNICAL BOOLEAN,
     ORDERINDEX INTEGER,
     SYMMETRICAL BOOLEAN,
@@ -906,7 +830,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_AUD(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    TERMTYPE INTEGER,
+    TERMTYPE VARCHAR(4),
     IDINVOCABULARY VARCHAR(255),
     LSID_AUTHORITY VARCHAR(255),
     LSID_LSID VARCHAR(255),
@@ -923,7 +847,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_AUD(
     VOCABULARY_ID INTEGER,
     ORDERINDEX INTEGER,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     SUPPORTSCATEGORICALDATA BOOLEAN,
     SUPPORTSCOMMONTAXONNAME BOOLEAN,
     SUPPORTSDISTRIBUTION BOOLEAN,
@@ -1070,18 +994,18 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_REPRESENTATION_AUD(
     REVTYPE TINYINT
 );
 -- 2084 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_REPRESENTATION_AUD;
-CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO(
     DEFINEDTERMBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     DEFINEDTERMBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_STATISTICALMEASURE(
     DEFINEDTERMBASE_ID INTEGER NOT NULL,
     RECOMMENDEDSTATISTICALMEASURES_ID INTEGER NOT NULL
@@ -1106,18 +1030,18 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION_AUD;
-CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY(
+CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY(
     DEFINEDTERMBASE_ID INTEGER NOT NULL,
-    WATERBODIESORCOUNTRIES_ID INTEGER NOT NULL
+    COUNTRIES_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY;
-CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_COUNTRY;
+CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY_AUD(
     REV INTEGER NOT NULL,
     DEFINEDTERMBASE_ID INTEGER NOT NULL,
-    WATERBODIESORCOUNTRIES_ID INTEGER NOT NULL,
+    COUNTRIES_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DEFINEDTERMBASE_COUNTRY_AUD;
 CREATE CACHED TABLE PUBLIC.DERIVATIONEVENT(
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
@@ -1316,18 +1240,18 @@ CREATE CACHED TABLE PUBLIC.DESCRIPTIONBASE_REFERENCE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.DESCRIPTIONBASE_REFERENCE_AUD;
-CREATE CACHED TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO(
     DESCRIPTIONBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.DESCRIPTIONBASE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DESCRIPTIONBASE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     DESCRIPTIONBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.DESCRIPTIONBASE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DESCRIPTIONBASE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.DESCRIPTIONBASE_SCOPE(
     DESCRIPTIONBASE_ID INTEGER NOT NULL,
     SCOPES_ID INTEGER NOT NULL
@@ -1351,6 +1275,7 @@ CREATE CACHED TABLE PUBLIC.DESCRIPTIONELEMENTBASE(
     TIMEPERIOD_END VARCHAR(255),
     TIMEPERIOD_FREETEXT VARCHAR(255),
     ORDERRELEVANT BOOLEAN,
+    UNKNOWNDATA BOOLEAN,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     FEATURE_ID INTEGER,
@@ -1377,6 +1302,7 @@ CREATE CACHED TABLE PUBLIC.DESCRIPTIONELEMENTBASE_AUD(
     TIMEPERIOD_END VARCHAR(255),
     TIMEPERIOD_FREETEXT VARCHAR(255),
     ORDERRELEVANT BOOLEAN,
+    UNKNOWNDATA BOOLEAN,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     FEATURE_ID INTEGER,
@@ -1670,8 +1596,6 @@ CREATE CACHED TABLE PUBLIC.FEATURETREE(
     LSID_REVISION VARCHAR(255),
     PROTECTEDTITLECACHE BOOLEAN NOT NULL,
     TITLECACHE VARCHAR(255),
-    URI CLOB,
-    DESCRIPTIONSEPARATED BOOLEAN NOT NULL,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ROOT_ID INTEGER
@@ -1691,8 +1615,6 @@ CREATE CACHED TABLE PUBLIC.FEATURETREE_AUD(
     LSID_REVISION VARCHAR(255),
     PROTECTEDTITLECACHE BOOLEAN,
     TITLECACHE VARCHAR(255),
-    URI CLOB,
-    DESCRIPTIONSEPARATED BOOLEAN,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ROOT_ID INTEGER
@@ -1772,18 +1694,18 @@ CREATE CACHED TABLE PUBLIC.FEATURETREE_REPRESENTATION_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.FEATURETREE_REPRESENTATION_AUD;
-CREATE CACHED TABLE PUBLIC.FEATURETREE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.FEATURETREE_RIGHTSINFO(
     FEATURETREE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.FEATURETREE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.FEATURETREE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.FEATURETREE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.FEATURETREE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     FEATURETREE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.FEATURETREE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.FEATURETREE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.GATHERINGEVENT(
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
@@ -2192,52 +2114,74 @@ CREATE CACHED TABLE PUBLIC.MARKER_AUD(
     MARKERTYPE_ID INTEGER
 );
 
-CREATE TABLE MATERIALANDMETHOD (
+CREATE TABLE MATERIALORMETHODEVENT (
     ID INTEGER NOT NULL,
+    DTYPE VARCHAR(255),
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    MATERIALMETHODTERM BINARY(255),
     MATERIALMETHODTEXT VARCHAR(255),
+    DESCRIPTION VARCHAR(255),
+    TIMEPERIOD_END VARCHAR(255),
+    TIMEPERIOD_FREETEXT VARCHAR(255),
+    TIMEPERIOD_START VARCHAR(255),
+       STRAIN VARCHAR(255),
+    TEMPERATURE DOUBLE,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
+    DEFINEDMATERIALORMETHOD_ID INTEGER,
+    ACTOR_ID INTEGER,
+    FORWARDPRIMER_ID INTEGER,
+    REVERSEPRIMER_ID INTEGER,
+    MEDIUM_ID INTEGER,
     PRIMARY KEY (ID)
 );
 
-CREATE TABLE MATERIALANDMETHOD_AUD (
+CREATE TABLE MATERIALORMETHODEVENT_AUD (
     ID INTEGER NOT NULL,
+    DTYPE VARCHAR(255),
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    MATERIALMETHODTERM BINARY(255),
     MATERIALMETHODTEXT VARCHAR(255),
+    DESCRIPTION VARCHAR(255),
+    TIMEPERIOD_END VARCHAR(255),
+    TIMEPERIOD_FREETEXT VARCHAR(255),
+    TIMEPERIOD_START VARCHAR(255),
+       STRAIN VARCHAR(255),
+    TEMPERATURE DOUBLE,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
+    DEFINEDMATERIALORMETHOD_ID INTEGER,
+    ACTOR_ID INTEGER,
+    FORWARDPRIMER_ID INTEGER,
+    REVERSEPRIMER_ID INTEGER,
+    MEDIUM_ID INTEGER
 );
 
-CREATE TABLE MATERIALANDMETHOD_ANNOTATION (
-    MATERIALANDMETHOD_ID INTEGER NOT NULL,
+CREATE TABLE MATERIALORMETHODEVENT_ANNOTATION (
+    MATERIALORMETHODEVENT_ID INTEGER NOT NULL,
     ANNOTATIONS_ID INTEGER NOT NULL,
-    PRIMARY KEY (MATERIALANDMETHOD_ID, ANNOTATIONS_ID)
+    PRIMARY KEY (MATERIALORMETHODEVENT_ID, ANNOTATIONS_ID)
 );
 
-CREATE TABLE MATERIALANDMETHOD_ANNOTATION_AUD (
+CREATE TABLE MATERIALORMETHODEVENT_ANNOTATION_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
-    MATERIALANDMETHOD_ID INTEGER NOT NULL,
+    MATERIALORMETHODEVENT_ID INTEGER NOT NULL,
     ANNOTATIONS_ID INTEGER NOT NULL,
 );
 
-CREATE TABLE MATERIALANDMETHOD_MARKER (
-    MATERIALANDMETHOD_ID INTEGER NOT NULL,
+CREATE TABLE MATERIALORMETHODEVENT_MARKER (
+    MATERIALORMETHODEVENT_ID INTEGER NOT NULL,
     MARKERS_ID INTEGER NOT NULL,
-    PRIMARY KEY (MATERIALANDMETHOD_ID, MARKERS_ID)
+    PRIMARY KEY (MATERIALORMETHODEVENT_ID, MARKERS_ID)
 );
 
-CREATE TABLE MATERIALANDMETHOD_MARKER_AUD (
+CREATE TABLE MATERIALORMETHODEVENT_MARKER_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
-    MATERIALANDMETHOD_ID INTEGER NOT NULL,
+    MATERIALORMETHODEVENT_ID INTEGER NOT NULL,
     MARKERS_ID INTEGER NOT NULL,
 );
 
@@ -2493,18 +2437,18 @@ CREATE CACHED TABLE PUBLIC.MEDIA_REPRESENTATION_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.MEDIA_REPRESENTATION_AUD;
-CREATE CACHED TABLE PUBLIC.MEDIA_RIGHTS(
+CREATE CACHED TABLE PUBLIC.MEDIA_RIGHTSINFO(
     MEDIA_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.MEDIA_RIGHTS;
-CREATE CACHED TABLE PUBLIC.MEDIA_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.MEDIA_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.MEDIA_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     MEDIA_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.MEDIA_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.MEDIA_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.MEDIA_SEQUENCE(
     MEDIA_ID INTEGER NOT NULL,
     USEDSEQUENCES_ID INTEGER NOT NULL
@@ -2685,7 +2629,7 @@ CREATE CACHED TABLE PUBLIC.ORIGINALSOURCEBASE(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    SOURCETYPE INTEGER NOT NULL,
+    SOURCETYPE VARCHAR(4) NOT NULL,
     CITATIONMICROREFERENCE VARCHAR(255),
     ORIGINALNAMESTRING VARCHAR(255),
     IDINSOURCE VARCHAR(255),
@@ -2706,7 +2650,7 @@ CREATE CACHED TABLE PUBLIC.ORIGINALSOURCEBASE_AUD(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-       SOURCETYPE INTEGER NOT NULL,
+       SOURCETYPE VARCHAR(4) NOT NULL,
     CITATIONMICROREFERENCE VARCHAR(255),
     ORIGINALNAMESTRING VARCHAR(255),
     IDINSOURCE VARCHAR(255),
@@ -2920,18 +2864,18 @@ CREATE CACHED TABLE PUBLIC.POLYTOMOUSKEY_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.POLYTOMOUSKEY_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS(
+CREATE CACHED TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO(
     POLYTOMOUSKEY_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.POLYTOMOUSKEY_RIGHTS;
-CREATE CACHED TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.POLYTOMOUSKEY_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     POLYTOMOUSKEY_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.POLYTOMOUSKEY_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.POLYTOMOUSKEY_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.POLYTOMOUSKEY_SCOPE(
     POLYTOMOUSKEY_ID INTEGER NOT NULL,
     SCOPERESTRICTIONS_ID INTEGER NOT NULL
@@ -3050,7 +2994,7 @@ CREATE CACHED TABLE PUBLIC.REFERENCE(
     ABBREVTITLE VARCHAR(255),
     ABBREVTITLECACHE CLOB,
     PROTECTEDABBREVTITLECACHE BOOLEAN,
-    REFTYPE INTEGER,
+    REFTYPE VARCHAR(4),
     URI CLOB,
     VOLUME VARCHAR(255),
     CREATEDBY_ID INTEGER,
@@ -3100,7 +3044,7 @@ CREATE CACHED TABLE PUBLIC.REFERENCE_AUD(
     ABBREVTITLE VARCHAR(255),
     ABBREVTITLECACHE CLOB,
     PROTECTEDABBREVTITLECACHE BOOLEAN,
-    REFTYPE INTEGER,
+    REFTYPE  VARCHAR(4),
     URI CLOB,
     VOLUME VARCHAR(255),
     CREATEDBY_ID INTEGER,
@@ -3185,18 +3129,18 @@ CREATE CACHED TABLE PUBLIC.REFERENCE_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.REFERENCE_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.REFERENCE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.REFERENCE_RIGHTSINFO(
     REFERENCE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.REFERENCE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.REFERENCE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.REFERENCE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.REFERENCE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     REFERENCE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.REFERENCE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.REFERENCE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.RELATIONSHIPTERMBASE_INVERSEREPRESENTATION(
     DEFINEDTERMBASE_ID INTEGER NOT NULL,
     INVERSEREPRESENTATIONS_ID INTEGER NOT NULL
@@ -3261,7 +3205,7 @@ CREATE CACHED TABLE PUBLIC.REPRESENTATION_MARKER_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.REPRESENTATION_MARKER_AUD;
-CREATE CACHED TABLE PUBLIC.RIGHTS(
+CREATE CACHED TABLE PUBLIC.RIGHTSINFO(
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
@@ -3275,8 +3219,8 @@ CREATE CACHED TABLE PUBLIC.RIGHTS(
     AGENT_ID INTEGER,
     TYPE_ID INTEGER
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTS;
-CREATE CACHED TABLE PUBLIC.RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.RIGHTSINFO_AUD(
     ID INTEGER NOT NULL,
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
@@ -3292,27 +3236,27 @@ CREATE CACHED TABLE PUBLIC.RIGHTS_AUD(
     AGENT_ID INTEGER,
     TYPE_ID INTEGER
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTS_AUD;
-CREATE CACHED TABLE PUBLIC.RIGHTS_ANNOTATION(
-    RIGHTS_ID INTEGER NOT NULL,
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTSINFO_AUD;
+CREATE CACHED TABLE PUBLIC.RIGHTSINFO_ANNOTATION(
+    RIGHTSINFO_ID INTEGER NOT NULL,
     ANNOTATIONS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTS_ANNOTATION;
-CREATE CACHED TABLE PUBLIC.RIGHTS_ANNOTATION_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTSINFO_ANNOTATION;
+CREATE CACHED TABLE PUBLIC.RIGHTSINFO_ANNOTATION_AUD(
     REV INTEGER NOT NULL,
-    RIGHTS_ID INTEGER NOT NULL,
+    RIGHTSINFO_ID INTEGER NOT NULL,
     ANNOTATIONS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTS_ANNOTATION_AUD;
-CREATE CACHED TABLE PUBLIC.RIGHTS_MARKER(
-    RIGHTS_ID INTEGER NOT NULL,
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTSINFO_ANNOTATION_AUD;
+CREATE CACHED TABLE PUBLIC.RIGHTSINFO_MARKER(
+    RIGHTSINFO_ID INTEGER NOT NULL,
     MARKERS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTS_MARKER;
-CREATE CACHED TABLE PUBLIC.RIGHTS_MARKER_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.RIGHTSINFO_MARKER;
+CREATE CACHED TABLE PUBLIC.RIGHTSINFO_MARKER_AUD(
     REV INTEGER NOT NULL,
-    RIGHTS_ID INTEGER NOT NULL,
+    RIGHTSINFO_ID INTEGER NOT NULL,
     MARKERS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
@@ -3334,7 +3278,7 @@ CREATE TABLE SEQUENCE (
     UPDATEDBY_ID INTEGER,
     CONTIGFILE_ID INTEGER,
     DNASAMPLE_ID INTEGER,
-    MARKER_ID INTEGER,
+    DNAMARKER_ID INTEGER,
     PRIMARY KEY (ID)
 );
 CREATE TABLE SEQUENCE_AUD (
@@ -3356,7 +3300,7 @@ CREATE TABLE SEQUENCE_AUD (
     UPDATEDBY_ID INTEGER,
     CONTIGFILE_ID INTEGER,
     DNASAMPLE_ID INTEGER,
-    MARKER_ID INTEGER
+    DNAMARKER_ID INTEGER
 );
 
 CREATE TABLE SEQUENCE_ANNOTATION (
@@ -3394,19 +3338,19 @@ CREATE TABLE SEQUENCE_REFERENCE_AUD (
     CITATIONS_ID INTEGER NOT NULL
 );
 
-CREATE TABLE SEQUENCE_SINGLESEQUENCE (
+CREATE TABLE SEQUENCE_SINGLEREAD (
     SEQUENCE_ID INTEGER NOT NULL,
-    SINGLESEQUENCES_ID INTEGER NOT NULL,
-    PRIMARY KEY (SEQUENCE_ID, SINGLESEQUENCES_ID)
+    SINGLEREADS_ID INTEGER NOT NULL,
+    PRIMARY KEY (SEQUENCE_ID, SINGLEREADS_ID)
 );
-CREATE TABLE SEQUENCE_SINGLESEQUENCE_AUD (
+CREATE TABLE SEQUENCE_SINGLEREAD_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
     SEQUENCE_ID INTEGER NOT NULL,
-    SINGLESEQUENCES_ID INTEGER NOT NULL
+    SINGLEREADS_ID INTEGER NOT NULL
 );
 
-CREATE TABLE SINGLESEQUENCE (
+CREATE TABLE SINGLEREAD (
     ID INTEGER NOT NULL,
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
@@ -3415,19 +3359,19 @@ CREATE TABLE SINGLESEQUENCE (
     TIMEPERIOD_END VARCHAR(255),
     TIMEPERIOD_FREETEXT VARCHAR(255),
     TIMEPERIOD_START VARCHAR(255),
-    DIRECTION INTEGER,
+    DIRECTION VARCHAR(3),
     SEQUENCE_LENGTH INTEGER,
     SEQUENCE_STRING CLOB,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ACTOR_ID INTEGER,
     AMPLIFICATION_ID INTEGER,
-    MATERIALANDMETHOD_ID INTEGER,
+    MATERIALORMETHOD_ID INTEGER,
     PHEROGRAM_ID INTEGER,
     PRIMER_ID INTEGER,
     PRIMARY KEY (ID)
 );
-CREATE TABLE SINGLESEQUENCE_AUD (
+CREATE TABLE SINGLEREAD_AUD (
     ID INTEGER NOT NULL,
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
@@ -3438,40 +3382,40 @@ CREATE TABLE SINGLESEQUENCE_AUD (
     TIMEPERIOD_END VARCHAR(255),
     TIMEPERIOD_FREETEXT VARCHAR(255),
     TIMEPERIOD_START VARCHAR(255),
-    DIRECTION INTEGER,
+    DIRECTION VARCHAR(3),
     SEQUENCE_LENGTH INTEGER,
     SEQUENCE_STRING CLOB,
     CREATEDBY_ID INTEGER,
     UPDATEDBY_ID INTEGER,
     ACTOR_ID INTEGER,
     AMPLIFICATION_ID INTEGER,
-    MATERIALANDMETHOD_ID INTEGER,
+    MATERIALORMETHOD_ID INTEGER,
     PHEROGRAM_ID INTEGER,
     PRIMER_ID INTEGER
 );
 
-CREATE TABLE SINGLESEQUENCE_ANNOTATION (
-    SINGLESEQUENCE_ID INTEGER NOT NULL,
+CREATE TABLE SINGLEREAD_ANNOTATION (
+    SINGLEREAD_ID INTEGER NOT NULL,
     ANNOTATIONS_ID INTEGER NOT NULL,
-    PRIMARY KEY (SINGLESEQUENCE_ID, ANNOTATIONS_ID)
+    PRIMARY KEY (SINGLEREAD_ID, ANNOTATIONS_ID)
 );
-CREATE TABLE SINGLESEQUENCE_ANNOTATION_AUD (
+CREATE TABLE SINGLEREAD_ANNOTATION_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
-    SINGLESEQUENCE_ID INTEGER NOT NULL,
+    SINGLEREAD_ID INTEGER NOT NULL,
     ANNOTATIONS_ID INTEGER NOT NULL
 );
 
-CREATE TABLE SINGLESEQUENCE_MARKER (
-    SINGLESEQUENCE_ID INTEGER NOT NULL,
+CREATE TABLE SINGLEREAD_MARKER (
+    SINGLEREAD_ID INTEGER NOT NULL,
     MARKERS_ID INTEGER NOT NULL,
-    PRIMARY KEY (SINGLESEQUENCE_ID, MARKERS_ID)
+    PRIMARY KEY (SINGLEREAD_ID, MARKERS_ID)
 );
 
-CREATE TABLE SINGLESEQUENCE_MARKER_AUD (
+CREATE TABLE SINGLEREAD_MARKER_AUD (
     REV INTEGER NOT NULL,
     REVTYPE TINYINT,
-    SINGLESEQUENCE_ID INTEGER NOT NULL,
+    SINGLEREAD_ID INTEGER NOT NULL,
     MARKERS_ID INTEGER NOT NULL
 );
 
@@ -3482,7 +3426,7 @@ CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    RECORDBASIS INTEGER,
+    RECORDBASIS  VARCHAR(4) NOT NULL,
     LSID_AUTHORITY VARCHAR(255),
     LSID_LSID VARCHAR(255),
     LSID_NAMESPACE VARCHAR(255),
@@ -3497,6 +3441,7 @@ CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE(
     CATALOGNUMBER VARCHAR(255),
     COLLECTORSNUMBER VARCHAR(255),
     EXSICCATUM VARCHAR(255),
+    ORIGINALLABELINFO CLOB,
     FIELDNOTES VARCHAR(255),
     FIELDNUMBER VARCHAR(255),
     CREATEDBY_ID INTEGER,
@@ -3522,7 +3467,7 @@ CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_AUD(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    RECORDBASIS INTEGER,
+    RECORDBASIS  VARCHAR(4) NOT NULL,
     LSID_AUTHORITY VARCHAR(255),
     LSID_LSID VARCHAR(255),
     LSID_NAMESPACE VARCHAR(255),
@@ -3537,6 +3482,7 @@ CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_AUD(
     CATALOGNUMBER VARCHAR(255),
     COLLECTORSNUMBER VARCHAR(255),
     EXSICCATUM VARCHAR(255),
+    ORIGINALLABELINFO CLOB,
     FIELDNOTES VARCHAR(255),
     FIELDNUMBER VARCHAR(255),
     CREATEDBY_ID INTEGER,
@@ -3629,18 +3575,6 @@ CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MARKER_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_MARKER_AUD;
-CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA(
-    SPECIMENOROBSERVATIONBASE_ID INTEGER NOT NULL,
-    MEDIA_ID INTEGER NOT NULL
-);
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA;
-CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA_AUD(
-    REV INTEGER NOT NULL,
-    SPECIMENOROBSERVATIONBASE_ID INTEGER NOT NULL,
-    MEDIA_ID INTEGER NOT NULL,
-    REVTYPE TINYINT
-);
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA_AUD;
 CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE(
     SPECIMENOROBSERVATIONBASE_ID INTEGER NOT NULL,
     SOURCES_ID INTEGER NOT NULL
@@ -3653,18 +3587,18 @@ CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO(
     SPECIMENOROBSERVATIONBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     SPECIMENOROBSERVATIONBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_SEQUENCE(
     SPECIMENOROBSERVATIONBASE_ID INTEGER NOT NULL,
     SEQUENCES_ID INTEGER NOT NULL
@@ -3944,18 +3878,18 @@ CREATE CACHED TABLE PUBLIC.TAXONBASE_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONBASE_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.TAXONBASE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.TAXONBASE_RIGHTSINFO(
     TAXONBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONBASE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.TAXONBASE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONBASE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.TAXONBASE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     TAXONBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONBASE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONBASE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.TAXONINTERACTION_LANGUAGESTRING(
     DESCRIPTIONELEMENTBASE_ID INTEGER NOT NULL,
     DESCRIPTION_ID INTEGER NOT NULL,
@@ -4149,18 +4083,18 @@ CREATE CACHED TABLE PUBLIC.TAXONNAMEBASE_ORIGINALSOURCEBASE_AUD(
     REVTYPE TINYINT
 );
 -- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAMEBASE_ORIGINALSOURCEBASE_AUD;
-CREATE CACHED TABLE PUBLIC.TAXONNAMEBASE_RIGHTS(
+CREATE CACHED TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO(
     TAXONNAMEBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAMEBASE_RIGHTS;
-CREATE CACHED TABLE PUBLIC.TAXONNAMEBASE_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAMEBASE_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     TAXONNAMEBASE_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAMEBASE_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAMEBASE_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.TAXONNAMEBASE_TYPEDESIGNATIONBASE(
     TAXONNAMEBASE_ID INTEGER NOT NULL,
     TYPEDESIGNATIONS_ID INTEGER NOT NULL
@@ -4299,7 +4233,7 @@ CREATE CACHED TABLE PUBLIC.TERMVOCABULARY(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    TERMTYPE INTEGER,
+    TERMTYPE VARCHAR(4),
     LSID_AUTHORITY VARCHAR(255),
     LSID_LSID VARCHAR(255),
     LSID_NAMESPACE VARCHAR(255),
@@ -4321,7 +4255,7 @@ CREATE CACHED TABLE PUBLIC.TERMVOCABULARY_AUD(
     CREATED TIMESTAMP,
     UUID VARCHAR(36),
     UPDATED TIMESTAMP,
-    TERMTYPE INTEGER,
+    TERMTYPE VARCHAR(4),
     LSID_AUTHORITY VARCHAR(255),
     LSID_LSID VARCHAR(255),
     LSID_NAMESPACE VARCHAR(255),
@@ -4409,18 +4343,18 @@ CREATE CACHED TABLE PUBLIC.TERMVOCABULARY_REPRESENTATION_AUD(
     REVTYPE TINYINT
 );
 -- 37 +/- SELECT COUNT(*) FROM PUBLIC.TERMVOCABULARY_REPRESENTATION_AUD;
-CREATE CACHED TABLE PUBLIC.TERMVOCABULARY_RIGHTS(
+CREATE CACHED TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO(
     TERMVOCABULARY_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.TERMVOCABULARY_RIGHTS;
-CREATE CACHED TABLE PUBLIC.TERMVOCABULARY_RIGHTS_AUD(
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TERMVOCABULARY_RIGHTSINFO;
+CREATE CACHED TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO_AUD(
     REV INTEGER NOT NULL,
     TERMVOCABULARY_ID INTEGER NOT NULL,
     RIGHTS_ID INTEGER NOT NULL,
     REVTYPE TINYINT
 );
--- 0 +/- SELECT COUNT(*) FROM PUBLIC.TERMVOCABULARY_RIGHTS_AUD;
+-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TERMVOCABULARY_RIGHTSINFO_AUD;
 CREATE CACHED TABLE PUBLIC.TYPEDESIGNATIONBASE(
     DTYPE VARCHAR(31) NOT NULL,
     ID INTEGER NOT NULL,
@@ -4622,7 +4556,7 @@ ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONS
 ----ALTER TABLE PUBLIC.SEQUENCE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7E6 PRIMARY KEY(SEQUENCE_ID, SORTINDEX);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX340 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.GRANTEDAUTHORITYIMPL ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX346 PRIMARY KEY(ID);
-ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX341 PRIMARY KEY(POLYTOMOUSKEY_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX341 PRIMARY KEY(POLYTOMOUSKEY_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.WORKINGSET_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBCB PRIMARY KEY(REV, WORKINGSET_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.TAXONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBC2 PRIMARY KEY(TAXONBASE_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.GATHERINGEVENT_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX33F PRIMARY KEY(REV, GATHERINGEVENT_ID, MARKERS_ID);
@@ -4632,7 +4566,7 @@ ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_SEQUENCE_AUD ADD CONSTRAINT PUBLIC.
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBB0 PRIMARY KEY(DETERMINATIONEVENT_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX33C PRIMARY KEY(REV, TAXONNAMEBASE_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFD PRIMARY KEY(DEFINEDTERMBASE_ID, SOURCES_ID);
-ALTER TABLE PUBLIC.TAXONBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX185 PRIMARY KEY(TAXONBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.TAXONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX185 PRIMARY KEY(TAXONBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX36E PRIMARY KEY(TERMVOCABULARY_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.DETERMINATIONEVENT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFE PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.MEDIA_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX15A PRIMARY KEY(MEDIA_ID, SORTINDEX);
@@ -4641,7 +4575,7 @@ ALTER TABLE PUBLIC.NAMERELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_CREDIT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD97 PRIMARY KEY(REV, POLYTOMOUSKEY_ID, CREDITS_ID, SORTINDEX);
 ALTER TABLE PUBLIC.MEDIA_DESCRIPTION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD9A PRIMARY KEY(MEDIA_ID, DESCRIPTION_MAPKEY_ID);
 ----ALTER TABLE PUBLIC.SEQUENCE_CREDIT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD9D PRIMARY KEY(REV, SEQUENCE_ID, CREDITS_ID, SORTINDEX);
-ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX371 PRIMARY KEY(TERMVOCABULARY_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX371 PRIMARY KEY(TERMVOCABULARY_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.SEQUENCE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBA5 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.CREDIT_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBE3 PRIMARY KEY(REV, CREDIT_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7FE PRIMARY KEY(TAXONRELATIONSHIP_ID, MARKERS_ID);
@@ -4653,8 +4587,8 @@ ALTER TABLE PUBLIC.TAXONINTERACTION_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRA
 ALTER TABLE PUBLIC.MEDIAREPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBE0 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MEASUREMENTUNIT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBA2 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, RECOMMENDEDMEASUREMENTUNITS_ID);
 ALTER TABLE PUBLIC.LANGUAGESTRING_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF36 PRIMARY KEY(REV, LANGUAGESTRING_ID, MARKERS_ID);
-ALTER TABLE PUBLIC.RIGHTS_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX301 PRIMARY KEY(REV, RIGHTS_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.REFERENCE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF43 PRIMARY KEY(REV, REFERENCE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.RIGHTSINFO_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX301 PRIMARY KEY(REV, RIGHTSINFO_ID, ANNOTATIONS_ID);
+ALTER TABLE PUBLIC.REFERENCE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF43 PRIMARY KEY(REV, REFERENCE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7A3 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.TAXONNODE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF49 PRIMARY KEY(REV, TAXONNODE_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.REPRESENTATION_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF1F PRIMARY KEY(REPRESENTATION_ID, ANNOTATIONS_ID);
@@ -4663,7 +4597,7 @@ ALTER TABLE PUBLIC.TERMVOCABULARY_REPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAIN
 ALTER TABLE PUBLIC.TERMVOCABULARY_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9D7 PRIMARY KEY(REV, TERMVOCABULARY_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.MEDIAREPRESENTATIONPART ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX557 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX550 PRIMARY KEY(ID, REV);
-ALTER TABLE PUBLIC.FEATURETREE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9E6 PRIMARY KEY(REV, FEATURETREE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.FEATURETREE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9E6 PRIMARY KEY(REV, FEATURETREE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9E5 PRIMARY KEY(POLYTOMOUSKEY_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX314 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.AGENTBASE_DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX599 PRIMARY KEY(AGENTBASE_ID, TYPES_ID);
@@ -4697,14 +4631,13 @@ ALTER TABLE PUBLIC.TAXONNODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC10 PRIMARY KEY
 ALTER TABLE PUBLIC.MEDIAREPRESENTATION_MEDIAREPRESENTATIONPART_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX718 PRIMARY KEY(REV, REPRESENTATION_ID, ID, SORTINDEX);
 ALTER TABLE PUBLIC.POLYTOMOUSKEYNODE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC29 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCA PRIMARY KEY(REV, DEFINEDTERMBASE_ID, MARKERS_ID);
-ALTER TABLE PUBLIC.RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCB PRIMARY KEY(ID, REV);
+ALTER TABLE PUBLIC.RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCB PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.DERIVATIONEVENT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCC PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.FEATURETREE_CREDIT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCE PRIMARY KEY(REV, FEATURETREE_ID, CREDITS_ID, SORTINDEX);
 ALTER TABLE PUBLIC.COLLECTION_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCF PRIMARY KEY(COLLECTION_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.COLLECTION_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDA PRIMARY KEY(REV, COLLECTION_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.COLLECTION_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDA PRIMARY KEY(REV, COLLECTION_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MODIFIER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD3 PRIMARY KEY(REV, DESCRIPTIONELEMENTBASE_ID, MODIFIERS_ID);
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD4B PRIMARY KEY(ID);
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD0 PRIMARY KEY(REV, SPECIMENOROBSERVATIONBASE_ID, MEDIA_ID);
 --ALTER TABLE PUBLIC.SEQUENCE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX726 PRIMARY KEY(SEQUENCE_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.STATEDATA_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD63 PRIMARY KEY(REV, STATEDATA_ID, MODIFYINGTEXT_ID, MODIFYINGTEXT_MAPKEY_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC4D PRIMARY KEY(TERMVOCABULARY_ID, ANNOTATIONS_ID);
@@ -4712,7 +4645,7 @@ ALTER TABLE PUBLIC.TERMVOCABULARY_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XX
 ALTER TABLE PUBLIC.FEATURETREE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69EA PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.TAXONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC0F PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.MEDIA_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC47 PRIMARY KEY(REV, MEDIA_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD56 PRIMARY KEY(REV, TAXONNAMEBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD56 PRIMARY KEY(REV, TAXONNAMEBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC63 PRIMARY KEY(SYNONYMRELATIONSHIP_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX818 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD80 PRIMARY KEY(POLYTOMOUSKEY_ID, SOURCES_ID);
@@ -4731,24 +4664,24 @@ ALTER TABLE PUBLIC.DESCRIPTIONBASE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXED
 ALTER TABLE PUBLIC.COLLECTION_MEDIA ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXEE PRIMARY KEY(COLLECTION_ID, MEDIA_ID);
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFA PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.CREDIT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFB PRIMARY KEY(ID, REV);
-ALTER TABLE PUBLIC.RIGHTS_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX14B PRIMARY KEY(RIGHTS_ID, MARKERS_ID);
-ALTER TABLE PUBLIC.FEATURETREE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF9 PRIMARY KEY(FEATURETREE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.RIGHTSINFO_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX14B PRIMARY KEY(RIGHTSINFO_ID, MARKERS_ID);
+ALTER TABLE PUBLIC.FEATURETREE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF9 PRIMARY KEY(FEATURETREE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX368 PRIMARY KEY(REV, SPECIMENOROBSERVATIONBASE_ID, SOURCES_ID);
-ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF5 PRIMARY KEY(CLASSIFICATION_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF5 PRIMARY KEY(CLASSIFICATION_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_CONTINENT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF4 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, CONTINENTS_ID);
 ALTER TABLE PUBLIC.CLASSIFICATION_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF7 PRIMARY KEY(CLASSIFICATION_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.MEDIA_TAXONBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF6 PRIMARY KEY(REV, MEDIA_ID, COVEREDTAXA_ID);
 ALTER TABLE PUBLIC.NAMERELATIONSHIP_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD5 PRIMARY KEY(REV, NAMERELATIONSHIP_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFF PRIMARY KEY(REV, ORIGINALSOURCEBASE_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.AGENTBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF1 PRIMARY KEY(AGENTBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.AGENTBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF1 PRIMARY KEY(AGENTBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.AGENTBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE8 PRIMARY KEY(AGENTBASE_ID, MARKERS_ID);
-ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD7 PRIMARY KEY(CLASSIFICATION_ID, ROOTNODES_ID);
+--ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD7 PRIMARY KEY(CLASSIFICATION_ID, ROOTNODES_ID);
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_REFERENCE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD6 PRIMARY KEY(REV, DETERMINATIONEVENT_ID, SETOFREFERENCES_ID);
 ALTER TABLE PUBLIC.DERIVATIONEVENT_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD9 PRIMARY KEY(DERIVATIONEVENT_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFDC7 PRIMARY KEY(TAXONNAMEBASE_ID, EXTENSIONS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE2 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.FEATURETREE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE0 PRIMARY KEY(FEATURETREE_ID, SORTINDEX);
-ALTER TABLE PUBLIC.COLLECTION_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDD PRIMARY KEY(COLLECTION_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.COLLECTION_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDD PRIMARY KEY(COLLECTION_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE5 PRIMARY KEY(DESCRIPTIONBASE_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDB PRIMARY KEY(DEFINEDTERMBASE_ID, SUPPORTEDCATEGORICALENUMERATIONS_ID);
 ALTER TABLE PUBLIC.MEDIA_REPRESENTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX65C7 PRIMARY KEY(REV, MEDIA_ID, KEYREPRESENTATIONS_ID);
@@ -4788,15 +4721,15 @@ ALTER TABLE PUBLIC.MEDIA_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX969
 ALTER TABLE PUBLIC.WORKINGSET_DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA53 PRIMARY KEY(WORKINGSET_ID, DESCRIPTIONS_ID);
 ALTER TABLE PUBLIC.SEQUENCE_REFERENCE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX514 PRIMARY KEY(REV, SEQUENCE_ID, CITATIONS_ID);
 ALTER TABLE PUBLIC.FEATURETREE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX906 PRIMARY KEY(FEATURETREE_ID, SOURCES_ID);
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX901 PRIMARY KEY(ID);
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX901 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.MEDIA_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX909 PRIMARY KEY(REV, MEDIA_ID, SOURCES_ID);
-ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA1D PRIMARY KEY(TAXONNAMEBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA1D PRIMARY KEY(TAXONNAMEBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX919 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.LSIDAUTHORITY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA44 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_FEATURE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX435 PRIMARY KEY(DESCRIPTIONBASE_ID, DESCRIPTIVESYSTEM_ID);
 ALTER TABLE PUBLIC.HOMOTYPICALGROUP_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA5F PRIMARY KEY(HOMOTYPICALGROUP_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8B6 PRIMARY KEY(ID);
-ALTER TABLE PUBLIC.MEDIA_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2E PRIMARY KEY(MEDIA_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.MEDIA_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2E PRIMARY KEY(MEDIA_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.INSTITUTIONALMEMBERSHIP_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX17 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX18 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.REFERENCE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX19 PRIMARY KEY(ID, REV);
@@ -4812,7 +4745,7 @@ ALTER TABLE PUBLIC.EXTENSION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX1D PRIMARY
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MEASUREMENTUNIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX1C PRIMARY KEY(DEFINEDTERMBASE_ID, RECOMMENDEDMEASUREMENTUNITS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_RECOMMENDEDMODIFIERENUMERATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX14 PRIMARY KEY(DEFINEDTERMBASE_ID, RECOMMENDEDMODIFIERENUMERATION_ID);
 ALTER TABLE PUBLIC.DERIVATIONEVENT_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF5F PRIMARY KEY(REV, DERIVATIONEVENT_ID, MARKERS_ID);
-ALTER TABLE PUBLIC.MEDIA_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX13 PRIMARY KEY(REV, MEDIA_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.MEDIA_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX13 PRIMARY KEY(REV, MEDIA_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2B PRIMARY KEY(DEFINEDTERMBASE_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.TAXONNODE_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8CB PRIMARY KEY(REV, TAXONNODE_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.TAXONBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXAFB PRIMARY KEY(TAXONBASE_ID, EXTENSIONS_ID);
@@ -4846,7 +4779,7 @@ ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.CONST
 ALTER TABLE PUBLIC.MEDIA_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX25D PRIMARY KEY(MEDIA_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFD6 PRIMARY KEY(DESCRIPTIONBASE_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.COLLECTION_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX984 PRIMARY KEY(COLLECTION_ID, SOURCES_ID);
-ALTER TABLE PUBLIC.RIGHTS_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFD2 PRIMARY KEY(REV, RIGHTS_ID, MARKERS_ID);
+ALTER TABLE PUBLIC.RIGHTSINFO_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFD2 PRIMARY KEY(REV, RIGHTSINFO_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.USERACCOUNT_GRANTEDAUTHORITYIMPL ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX225 PRIMARY KEY(USERACCOUNT_ID, GRANTEDAUTHORITIES_ID);
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX657 PRIMARY KEY(REV, SYNONYMRELATIONSHIP_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC3CB PRIMARY KEY(TERMVOCABULARY_ID, EXTENSIONS_ID);
@@ -4865,7 +4798,7 @@ ALTER TABLE PUBLIC.REPRESENTATION_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE8B
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MEDIA_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE8C PRIMARY KEY(REV, DESCRIPTIONELEMENTBASE_ID, MEDIA_ID, SORTINDEX);
 ALTER TABLE PUBLIC.STATEDATA_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX60B PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX656 PRIMARY KEY(REV, SPECIMENOROBSERVATIONBASE_ID, DEFINITION_ID, DEFINITION_MAPKEY_ID);
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB36 PRIMARY KEY(SPECIMENOROBSERVATIONBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB36 PRIMARY KEY(SPECIMENOROBSERVATIONBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.TAXONBASE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE3C PRIMARY KEY(REV, TAXONBASE_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC81E PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX98E PRIMARY KEY(TAXONNAMEBASE_ID, MARKERS_ID);
@@ -4890,15 +4823,15 @@ ALTER TABLE PUBLIC.POLYTOMOUSKEY_TAXON ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB77 P
 ALTER TABLE PUBLIC.REFERENCE_MEDIA_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFDC PRIMARY KEY(REV, REFERENCE_ID, MEDIA_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX60C PRIMARY KEY(DEFINEDTERMBASE_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.STATEDATA_DEFINEDTERMBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2864 PRIMARY KEY(REV, STATEDATA_ID, MODIFIERS_ID);
---ALTER TABLE PUBLIC.SEQUENCE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA9D PRIMARY KEY(REV, SEQUENCE_ID, RIGHTS_ID);
+--ALTER TABLE PUBLIC.SEQUENCE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA9D PRIMARY KEY(REV, SEQUENCE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.MEDIA_SEQUENCE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFE4 PRIMARY KEY(REV, MEDIA_ID, USEDSEQUENCES_ID);
 ALTER TABLE PUBLIC.WORKINGSET_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXEC9 PRIMARY KEY(WORKINGSET_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX4F7 PRIMARY KEY(TYPEDESIGNATIONBASE_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFB3 PRIMARY KEY(REV, HYBRIDRELATIONSHIP_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX286 PRIMARY KEY(REV, CLASSIFICATION_ID, ROOTNODES_ID);
+--ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX286 PRIMARY KEY(REV, CLASSIFICATION_ID, ROOTNODES_ID);
 ALTER TABLE PUBLIC.FEATURETREE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB9F PRIMARY KEY(FEATURETREE_ID, EXTENSIONS_ID);
 --ALTER TABLE PUBLIC.SEQUENCE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9EB PRIMARY KEY(SEQUENCE_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.RIGHTS_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5DE PRIMARY KEY(RIGHTS_ID, ANNOTATIONS_ID);
+ALTER TABLE PUBLIC.RIGHTSINFO_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5DE PRIMARY KEY(RIGHTSINFO_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.RELATIONSHIPTERMBASE_INVERSEREPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA96 PRIMARY KEY(DEFINEDTERMBASE_ID, INVERSEREPRESENTATIONS_ID);
 ALTER TABLE PUBLIC.MEDIA_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA7B PRIMARY KEY(REV, MEDIA_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA7D PRIMARY KEY(REV, SPECIMENOROBSERVATIONBASE_ID, ANNOTATIONS_ID);
@@ -4908,7 +4841,7 @@ ALTER TABLE PUBLIC.NAMERELATIONSHIP_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRA
 --ALTER TABLE PUBLIC.SEQUENCE_MEDIA ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX807 PRIMARY KEY(SEQUENCE_ID, CHROMATOGRAMS_ID);
 ALTER TABLE PUBLIC.ADDRESS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.WORKINGSET_DESCRIPTIONBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDAF PRIMARY KEY(REV, WORKINGSET_ID, DESCRIPTIONS_ID);
-ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA9 PRIMARY KEY(REV, POLYTOMOUSKEY_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA9 PRIMARY KEY(REV, POLYTOMOUSKEY_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5A PRIMARY KEY(REV, DEFINEDTERMBASE_ID, EXTENSIONS_ID);
 ALTER TABLE PUBLIC.LANGUAGESTRING_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6D PRIMARY KEY(REV, LANGUAGESTRING_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA8 PRIMARY KEY(ID);
@@ -4927,13 +4860,13 @@ ALTER TABLE PUBLIC.DESCRIPTIONBASE_FEATURE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_NAMEDAREA ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5A24 PRIMARY KEY(POLYTOMOUSKEY_ID, GEOGRAPHICALSCOPE_ID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEYNODE_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX3C PRIMARY KEY(POLYTOMOUSKEYNODE_ID, MODIFYINGTEXT_MAPKEY_ID);
 ALTER TABLE PUBLIC.MEDIA_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6B PRIMARY KEY(MEDIA_ID, EXTENSIONS_ID);
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6A PRIMARY KEY(REV, SPECIMENOROBSERVATIONBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6A PRIMARY KEY(REV, SPECIMENOROBSERVATIONBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_CREDIT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6634534 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, CREDITS_ID, SORTINDEX);
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX67 PRIMARY KEY(REV, SYNONYMRELATIONSHIP_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX68 PRIMARY KEY(DESCRIPTIONELEMENTBASE_ID, SOURCES_ID);
-ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX65 PRIMARY KEY(DESCRIPTIONBASE_ID, RIGHTS_ID);
-ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6F PRIMARY KEY(REV, DESCRIPTIONBASE_ID, RIGHTS_ID);
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69 PRIMARY KEY(DEFINEDTERMBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX65 PRIMARY KEY(DESCRIPTIONBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6F PRIMARY KEY(REV, DESCRIPTIONBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69 PRIMARY KEY(DEFINEDTERMBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DERIVATIONEVENT_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX72 PRIMARY KEY(REV, DERIVATIONEVENT_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDC8 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX88B PRIMARY KEY(TAXONNAMEBASE_ID, SORTINDEX);
@@ -4951,9 +4884,9 @@ ALTER TABLE PUBLIC.DETERMINATIONEVENT_REFERENCE ADD CONSTRAINT PUBLIC.CONSTRAINT
 ALTER TABLE PUBLIC.REFERENCE_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX88 PRIMARY KEY(REV, REFERENCE_ID, MARKERS_ID);
 --ALTER TABLE PUBLIC.SEQUENCE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8C PRIMARY KEY(REV, SEQUENCE_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_SCOPE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8B PRIMARY KEY(REV, POLYTOMOUSKEY_ID, SCOPERESTRICTIONS_ID);
-ALTER TABLE PUBLIC.REFERENCE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8A PRIMARY KEY(REFERENCE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.REFERENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8A PRIMARY KEY(REFERENCE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.MEDIA_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX87CF PRIMARY KEY(MEDIA_ID, ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8F PRIMARY KEY(REV, CLASSIFICATION_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8F PRIMARY KEY(REV, CLASSIFICATION_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.AGENTBASE_CONTACT_PHONENUMBERS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX95 PRIMARY KEY(REV, AGENTBASE_ID, CONTACT_PHONENUMBERS_ELEMENT);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_STATISTICALMEASUREMENTVALUE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8D PRIMARY KEY(DESCRIPTIONELEMENTBASE_ID, STATISTICALVALUES_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_RECOMMENDEDMODIFIERENUMERATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA5 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, RECOMMENDEDMODIFIERENUMERATION_ID);
@@ -4968,7 +4901,7 @@ ALTER TABLE PUBLIC.TAXONNAMEBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX
 ALTER TABLE PUBLIC.AGENTBASE_CONTACT_URLS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5C PRIMARY KEY(REV, AGENTBASE_ID, CONTACT_URLS_ELEMENT);
 ALTER TABLE PUBLIC.TAXONBASE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6B24 PRIMARY KEY(REV, TAXONBASE_ID, EXTENSIONS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_REPRESENTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5F PRIMARY KEY(REV, DEFINEDTERMBASE_ID, REPRESENTATIONS_ID);
-ALTER TABLE PUBLIC.TAXONBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX61 PRIMARY KEY(REV, TAXONBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.TAXONBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX61 PRIMARY KEY(REV, TAXONBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX1DF PRIMARY KEY(TERMVOCABULARY_ID, SORTINDEX);
 ALTER TABLE PUBLIC.FEATURENODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69E PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.USERACCOUNT_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX850 PRIMARY KEY(ID, REV);
@@ -4977,7 +4910,7 @@ ALTER TABLE PUBLIC.DERIVATIONEVENT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX83E PRIMA
 ALTER TABLE PUBLIC.TERMVOCABULARY_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDDD PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX3F PRIMARY KEY(REV, FEATURENODE_ID, ONLYAPPLICABLEIF_ID);
 ALTER TABLE PUBLIC.MEDIA_TAXONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXAA PRIMARY KEY(MEDIA_ID, COVEREDTAXA_ID);
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX96 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, WATERBODIESORCOUNTRIES_ID);
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX96 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, COUNTRIES_ID);
 ALTER TABLE PUBLIC.WORKINGSET_TAXONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCAA PRIMARY KEY(WORKINGSET_ID, COVEREDTAXA_ID);
 ALTER TABLE PUBLIC.WORKINGSET_REPRESENTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC9 PRIMARY KEY(REV, WORKINGSET_ID, REPRESENTATIONS_ID);
 ALTER TABLE PUBLIC.FEATURETREE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXAF PRIMARY KEY(ID, REV);
@@ -5013,14 +4946,13 @@ ALTER TABLE PUBLIC.MEDIA_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX
 ALTER TABLE PUBLIC.CDM_VIEW ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC5 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.MEDIAKEY_NAMEDAREA_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDBEE PRIMARY KEY(REV, MEDIA_ID, GEOGRAPHICALSCOPE_ID);
 ALTER TABLE PUBLIC.NAMERELATIONSHIP ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX3EB PRIMARY KEY(ID);
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX39 PRIMARY KEY(SPECIMENOROBSERVATIONBASE_ID, MEDIA_ID);
 ALTER TABLE PUBLIC.MEDIAKEY_TAXON_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE05 PRIMARY KEY(REV, MEDIAKEY_ID, TAXON_ID);
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX3CC PRIMARY KEY(REV, TAXONRELATIONSHIP_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.ANNOTATION_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX4D PRIMARY KEY(REV, ANNOTATION_ID, MARKERS_ID);
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX36 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX36 PRIMARY KEY(REV, DEFINEDTERMBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.STATISTICALMEASUREMENTVALUE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX35 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.FEATURETREE_REPRESENTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE02 PRIMARY KEY(REV, FEATURETREE_ID, REPRESENTATIONS_ID);
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDBE PRIMARY KEY(DEFINEDTERMBASE_ID, WATERBODIESORCOUNTRIES_ID);
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDBE PRIMARY KEY(DEFINEDTERMBASE_ID, COUNTRIES_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MODIFIER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX31 PRIMARY KEY(DESCRIPTIONELEMENTBASE_ID, MODIFIERS_ID);
 ALTER TABLE PUBLIC.FEATURETREE_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX32 PRIMARY KEY(REV, FEATURETREE_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX33 PRIMARY KEY(REV, DESCRIPTIONBASE_ID, MARKERS_ID);
@@ -5053,7 +4985,7 @@ ALTER TABLE PUBLIC.DETERMINATIONEVENT_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAIN
 ALTER TABLE PUBLIC.CLASSIFICATION_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX82 PRIMARY KEY(REV, CLASSIFICATION_ID, SOURCES_ID);
 ALTER TABLE PUBLIC.AGENTBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7A125 PRIMARY KEY(AGENTBASE_ID, SOURCES_ID);
 --ALTER TABLE PUBLIC.SEQUENCE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7F PRIMARY KEY(ID);
-ALTER TABLE PUBLIC.AGENTBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX63456AE PRIMARY KEY(REV, AGENTBASE_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.AGENTBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX63456AE PRIMARY KEY(REV, AGENTBASE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_REPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX83 PRIMARY KEY(DEFINEDTERMBASE_ID, REPRESENTATIONS_ID);
 ALTER TABLE PUBLIC.CLASSIFICATION_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX98 PRIMARY KEY(CLASSIFICATION_ID, EXTENSIONS_ID);
 ALTER TABLE PUBLIC.AGENTBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX53456AE PRIMARY KEY(AGENTBASE_ID, ANNOTATIONS_ID);
@@ -5077,7 +5009,7 @@ ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_CREDIT_AUD ADD CONSTRAINT PUBLIC.CO
 ALTER TABLE PUBLIC.LOCUS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX80 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.AGENTBASE_AGENTBASE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX93456AE PRIMARY KEY(REV, AGENTBASE_ID, TEAMMEMBERS_ID, SORTINDEX);
 ALTER TABLE PUBLIC.MULTIACCESSKEY_TAXON_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9D PRIMARY KEY(REV, MULTIACCESSKEY_ID, TAXON_ID);
-ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCFF PRIMARY KEY(REV, TERMVOCABULARY_ID, RIGHTS_ID);
+ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCFF PRIMARY KEY(REV, TERMVOCABULARY_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.REFERENCE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX85 PRIMARY KEY(REV, REFERENCE_ID, EXTENSIONS_ID);
 ALTER TABLE PUBLIC.EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX81 PRIMARY KEY(ID);
 ALTER TABLE PUBLIC.MULTIACCESSKEY_SCOPE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7C PRIMARY KEY(WORKINGSET_ID, SCOPERESTRICTIONS_ID);
@@ -5091,7 +5023,7 @@ ALTER TABLE PUBLIC.KEYSTATEMENT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7A PRIMARY K
 ALTER TABLE PUBLIC.REPRESENTATION_MARKER_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX91 PRIMARY KEY(REV, REPRESENTATION_ID, MARKERS_ID);
 ALTER TABLE PUBLIC.MEDIAKEY_SCOPE_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX40F PRIMARY KEY(REV, MEDIA_ID, SCOPERESTRICTIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7D PRIMARY KEY(ID);
---ALTER TABLE PUBLIC.SEQUENCE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX97 PRIMARY KEY(SEQUENCE_ID, RIGHTS_ID);
+--ALTER TABLE PUBLIC.SEQUENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX97 PRIMARY KEY(SEQUENCE_ID, RIGHTS_ID);
 ALTER TABLE PUBLIC.ADDRESS_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2 PRIMARY KEY(ID, REV);
 ALTER TABLE PUBLIC.REFERENCE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX804 PRIMARY KEY(REV, REFERENCE_ID, ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_NAMEDAREA_AUD ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX668 PRIMARY KEY(REV, POLYTOMOUSKEY_ID, GEOGRAPHICALSCOPE_ID);
@@ -5104,7 +5036,7 @@ ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XX
 ALTER TABLE PUBLIC.MEDIA ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX45D7 UNIQUE(UUID);
 ALTER TABLE PUBLIC.MEDIA_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX87CF2 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX3406 UNIQUE(UUID);
-ALTER TABLE PUBLIC.AGENTBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF1E UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.AGENTBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF1E UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.MEDIA_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9696 UNIQUE(TITLE_ID);
 ALTER TABLE PUBLIC.SEQUENCE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX9EB9 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXCE56 UNIQUE(MARKERS_ID);
@@ -5112,21 +5044,21 @@ ALTER TABLE PUBLIC.REFERENCE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX71C0 UNI
 ALTER TABLE PUBLIC.REPRESENTATION_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF1F6 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.COLLECTION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB51 UNIQUE(UUID);
 ALTER TABLE PUBLIC.NAMERELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX6E1E UNIQUE(ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.REFERENCE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8AD UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.REFERENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8AD UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.DERIVATIONEVENT_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX56B9 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MODIFYINGTEXT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE98 UNIQUE(MODIFYINGTEXT_ID);
 ALTER TABLE PUBLIC.LANGUAGESTRING_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF0C6 UNIQUE(MARKERS_ID);
-ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA1D5 UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA1D5 UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.FEATURETREE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXE04 UNIQUE(CREDITS_ID);
 ALTER TABLE PUBLIC.ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXC03 UNIQUE(UUID);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXF21 UNIQUE(CREDITS_ID);
---ALTER TABLE PUBLIC.SEQUENCE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX977 UNIQUE(RIGHTS_ID);
+--ALTER TABLE PUBLIC.SEQUENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX977 UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.TAXONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXC0FE UNIQUE(UUID);
 ALTER TABLE PUBLIC.TAXONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXBC2C UNIQUE(SOURCES_ID);
 ALTER TABLE PUBLIC.FEATURETREE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXF07 UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.TAXONBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXAFBA UNIQUE(EXTENSIONS_ID);
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX2F29 UNIQUE(UUID);
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX9013 UNIQUE(UUID);
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX9013 UNIQUE(UUID);
 ALTER TABLE PUBLIC.MEDIA_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX15AD UNIQUE(CREDITS_ID);
 ALTER TABLE PUBLIC.CLASSIFICATION_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXXDC0 UNIQUE(CREDITS_ID);
 ALTER TABLE PUBLIC.NAMERELATIONSHIP ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXXXX3EB1 UNIQUE(UUID);
@@ -5137,7 +5069,7 @@ ALTER TABLE PUBLIC.CLASSIFICATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX94CF UNIQU
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2BE4 UNIQUE(EXTENSIONS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDBF UNIQUE(SUPPORTEDCATEGORICALENUMERATIONS_ID);
 ALTER TABLE PUBLIC.LANGUAGESTRING_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5422 UNIQUE(ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB36B UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB36B UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.COLLECTION_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD488 UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX98E1 UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.REFERENCE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX4E7 UNIQUE(SOURCES_ID);
@@ -5154,7 +5086,7 @@ ALTER TABLE PUBLIC.COLLECTION_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC46 UNI
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_REPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX831 UNIQUE(REPRESENTATIONS_ID);
 ALTER TABLE PUBLIC.MEDIAREPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBE03 UNIQUE(UUID);
 --ALTER TABLE PUBLIC.SEQUENCE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7E63 UNIQUE(CREDITS_ID);
-ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX65C UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX65C UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.MEDIA_DESCRIPTION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD9A9 UNIQUE(DESCRIPTION_ID);
 ALTER TABLE PUBLIC.CDM_VIEW ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC5D UNIQUE(UUID);
 ALTER TABLE PUBLIC.STATEDATA_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC61 UNIQUE(MODIFYINGTEXT_ID);
@@ -5170,7 +5102,7 @@ ALTER TABLE PUBLIC.CLASSIFICATION_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5DC UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB869 UNIQUE(EXTENSIONS_ID);
 ALTER TABLE PUBLIC.CLASSIFICATION_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF70 UNIQUE(SOURCES_ID);
-ALTER TABLE PUBLIC.TAXONBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX185F UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.TAXONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX185F UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX1E18 UNIQUE(UUID);
 ALTER TABLE PUBLIC.REFERENCE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX599CB UNIQUE(EXTENSIONS_ID);
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX120 UNIQUE(MARKERS_ID);
@@ -5187,14 +5119,14 @@ ALTER TABLE PUBLIC.POLYTOMOUSKEY_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX
 ALTER TABLE PUBLIC.NOMENCLATURALSTATUS_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8797 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8188 UNIQUE(UUID);
 ALTER TABLE PUBLIC.TAXONNODE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXED73 UNIQUE(ANNOTATIONS_ID);
-ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX341F UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX341F UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX63F UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXAE96 UNIQUE(MARKERS_ID);
-ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD7D UNIQUE(ROOTNODES_ID);
+--ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD7D UNIQUE(ROOTNODES_ID);
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2820 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.ANNOTATION_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXAE UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.SEQUENCE_REFERENCE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7620 UNIQUE(CITATIONS_ID);
-ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF52 UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF52 UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXEB60 UNIQUE(SOURCES_ID);
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC63A UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXE56 UNIQUE(SOURCES_ID);
@@ -5204,7 +5136,7 @@ ALTER TABLE PUBLIC.TAXONRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT
 ALTER TABLE PUBLIC.NAMERELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC819 UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXAE52 UNIQUE(EXTENSIONS_ID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX60CA UNIQUE(MARKERS_ID);
-ALTER TABLE PUBLIC.COLLECTION_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDD7 UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.COLLECTION_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXDD7 UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.NOMENCLATURALSTATUS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBF7D UNIQUE(UUID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2E26 UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.AGENTBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX40 UNIQUE(UUID);
@@ -5226,7 +5158,7 @@ ALTER TABLE PUBLIC.MEDIA_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX
 ALTER TABLE PUBLIC.FEATURETREE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69EA1 UNIQUE(UUID);
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2B1 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7D6 UNIQUE(UUID);
-ALTER TABLE PUBLIC.FEATURETREE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF96 UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.FEATURETREE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXF96 UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC3CBC UNIQUE(EXTENSIONS_ID);
 ALTER TABLE PUBLIC.STATISTICALMEASUREMENTVALUE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX35B UNIQUE(UUID);
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_SEQUENCE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXBE634 UNIQUE(SEQUENCES_ID);
@@ -5253,7 +5185,7 @@ ALTER TABLE PUBLIC.DETERMINATIONEVENT_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XX
 ALTER TABLE PUBLIC.TAXONNAMEBASE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX88BA UNIQUE(CREDITS_ID);
 --ALTER TABLE PUBLIC.SEQUENCE_MEDIA ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX8079 UNIQUE(CHROMATOGRAMS_ID);
 ALTER TABLE PUBLIC.LSIDAUTHORITY ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA443 UNIQUE(UUID, AUTHORITY);
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69B UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX69B UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.TAXONNODE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXC103 UNIQUE(UUID);
 ALTER TABLE PUBLIC.GRANTEDAUTHORITYIMPL ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX3463 UNIQUE(UUID, AUTHORITY);
 --ALTER TABLE PUBLIC.SEQUENCE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX88C2 UNIQUE(EXTENSIONS_ID);
@@ -5264,7 +5196,7 @@ ALTER TABLE PUBLIC.MEDIA_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX25D4 UNIQUE(
 ALTER TABLE PUBLIC.WORKINGSET_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXEC95 UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.KEYSTATEMENT_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX729C UNIQUE(LABEL_ID);
 ALTER TABLE PUBLIC.SEQUENCE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7F1 UNIQUE(UUID);
-ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX371A UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX371A UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.TAXONNODE_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXB625 UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.FEATURETREE_REPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX444F UNIQUE(REPRESENTATIONS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_EXTENSION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXFDC73 UNIQUE(EXTENSIONS_ID);
@@ -5273,7 +5205,7 @@ ALTER TABLE PUBLIC.MEDIAREPRESENTATIONPART ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5
 ALTER TABLE PUBLIC.GATHERINGEVENT_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX63FFD UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.REPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5605 UNIQUE(UUID);
 ALTER TABLE PUBLIC.AGENTBASE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD8 UNIQUE(CREDITS_ID);
-ALTER TABLE PUBLIC.RIGHTS_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5DEB UNIQUE(ANNOTATIONS_ID);
+ALTER TABLE PUBLIC.RIGHTSINFO_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5DEB UNIQUE(ANNOTATIONS_ID);
 ALTER TABLE PUBLIC.TERMVOCABULARY_REPRESENTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX30E3 UNIQUE(REPRESENTATIONS_ID);
 ALTER TABLE PUBLIC.COLLECTION_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX984E UNIQUE(SOURCES_ID);
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_ANNOTATION ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXA47C UNIQUE(ANNOTATIONS_ID);
@@ -5295,10 +5227,10 @@ ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_STATISTICALMEASUREMENTVALUE ADD CONSTR
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_CREDIT ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXED4 UNIQUE(CREDITS_ID);
 ALTER TABLE PUBLIC.TAXONNAMEBASE_NOMENCLATURALSTATUS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX7D78 UNIQUE(STATUS_ID);
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_LANGUAGESTRING ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX5094 UNIQUE(MULTILANGUAGETEXT_ID);
-ALTER TABLE PUBLIC.RIGHTS_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX14BB UNIQUE(MARKERS_ID);
+ALTER TABLE PUBLIC.RIGHTSINFO_MARKER ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX14BB UNIQUE(MARKERS_ID);
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD4BB UNIQUE(UUID);
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.CONSTRAINT_XXXD80E UNIQUE(SOURCES_ID);
-ALTER TABLE PUBLIC.MEDIA_RIGHTS ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2EC UNIQUE(RIGHTS_ID);
+ALTER TABLE PUBLIC.MEDIA_RIGHTSINFO ADD CONSTRAINT PUBLIC.CONSTRAINT_XXX2EC UNIQUE(RIGHTS_ID);
 ALTER TABLE PUBLIC.LANGUAGESTRING_ANNOTATION ADD CONSTRAINT PUBLIC.FK8400DFA537998500 FOREIGN KEY(LANGUAGESTRING_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MEASUREMENTUNIT ADD CONSTRAINT PUBLIC.FKE9D17767D0BDAE9B FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_SEQUENCE_AUD ADD CONSTRAINT PUBLIC.FK3C7BD9CD34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5307,7 +5239,7 @@ ALTER TABLE PUBLIC.DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.FKFF4D58CDBC5DA539 FORE
 ALTER TABLE PUBLIC.FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE ADD CONSTRAINT PUBLIC.FK6AE876AB52FCC4B FOREIGN KEY(FEATURENODE_ID) REFERENCES PUBLIC.FEATURENODE(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.FKF810044F34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REPRESENTATION_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK36EEE73234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.MEDIA_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FKAB2ADBA334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.MEDIA_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FKAB2ADBA334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_CONTACT_PHONENUMBERS_AUD ADD CONSTRAINT PUBLIC.FKDDD347F534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.FK886D90B734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FKCFAA93163B8A5ABA FOREIGN KEY(SPECIMENOROBSERVATIONBASE_ID) REFERENCES PUBLIC.SPECIMENOROBSERVATIONBASE(ID) NOCHECK;
@@ -5315,7 +5247,7 @@ ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE ADD CONSTRAINT PUBLIC.FK38FE767134AF0E
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK365E4F3C3B8A5ABA FOREIGN KEY(SPECIMENOROBSERVATIONBASE_ID) REFERENCES PUBLIC.SPECIMENOROBSERVATIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_CREDIT ADD CONSTRAINT PUBLIC.FK29BCD8B28C85CF94 FOREIGN KEY(TAXONNAMEBASE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TERMVOCABULARY_MARKER ADD CONSTRAINT PUBLIC.FK862BAEA7258E060 FOREIGN KEY(TERMVOCABULARY_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKF98828E834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKF98828E834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK41ED09731E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_CREDIT ADD CONSTRAINT PUBLIC.FKC1F78FF4C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK2E340A664FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5324,7 +5256,7 @@ ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.FK21CA32728C7
 ALTER TABLE PUBLIC.AGENTBASE_EXTENSION ADD CONSTRAINT PUBLIC.FK8E1E5676927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MARKER ADD CONSTRAINT PUBLIC.FK89261453C0DB4934 FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE ADD CONSTRAINT PUBLIC.FK8AC9DCAE4CB0F315 FOREIGN KEY(TYPENAME_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.TAXONBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK65CF621B9C9D39 FOREIGN KEY(TAXONBASE_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.TAXONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK65CF621B9C9D39 FOREIGN KEY(TAXONBASE_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_MARKER ADD CONSTRAINT PUBLIC.FKD21E7935C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_CREDIT_AUD ADD CONSTRAINT PUBLIC.FK4B22838834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE ADD CONSTRAINT PUBLIC.FKB4870C67F90DF03 FOREIGN KEY(EXBASIONYMAUTHORTEAM_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
@@ -5332,7 +5264,7 @@ ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_STATEDATA_AUD ADD CONSTRAINT PUBLIC.FK
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_MARKER ADD CONSTRAINT PUBLIC.FKB3FFDC7C777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_EXTENSION ADD CONSTRAINT PUBLIC.FK7BE66D41927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK99ABA37B34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK6A2601A9C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK6A2601A9C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.TERMVOCABULARY_EXTENSION ADD CONSTRAINT PUBLIC.FKA8814EB2258E060 FOREIGN KEY(TERMVOCABULARY_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP ADD CONSTRAINT PUBLIC.FK9033CE7455F241D4 FOREIGN KEY(TYPE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.MULTIACCESSKEY_NAMEDAREA ADD CONSTRAINT PUBLIC.FK1F5A74893FF8E7B2 FOREIGN KEY(GEOGRAPHICALSCOPE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
@@ -5343,7 +5275,7 @@ ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK4D7327
 ALTER TABLE PUBLIC.TAXONNAMEBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK9E7794688C85CF94 FOREIGN KEY(TAXONNAMEBASE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP ADD CONSTRAINT PUBLIC.FK7482BA02BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.FKAE4A67A734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.FEATURETREE_RIGHTS ADD CONSTRAINT PUBLIC.FK8E50DD02C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.FEATURETREE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK8E50DD02C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.NOMENCLATURALSTATUS ADD CONSTRAINT PUBLIC.FK1FFEC88B7029BD9F FOREIGN KEY(TYPE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEYNODE_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK5574E12EF135C42B FOREIGN KEY(POLYTOMOUSKEYNODE_ID) REFERENCES PUBLIC.POLYTOMOUSKEYNODE(ID) NOCHECK;
 ALTER TABLE PUBLIC.GATHERINGEVENT_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK351E786C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5386,19 +5318,19 @@ ALTER TABLE PUBLIC.AGENTBASE_CREDIT ADD CONSTRAINT PUBLIC.FK2636742286EFC5D4 FOR
 ALTER TABLE PUBLIC.MEDIA_MARKER_AUD ADD CONSTRAINT PUBLIC.FK3F51048634869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REPRESENTATION_ANNOTATION ADD CONSTRAINT PUBLIC.FK371091E147E8AE60 FOREIGN KEY(REPRESENTATION_ID) REFERENCES PUBLIC.REPRESENTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.DERIVATIONEVENT_AUD ADD CONSTRAINT PUBLIC.FKDABF305434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK9754F464C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK9754F464C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.HOMOTYPICALGROUP_MARKER ADD CONSTRAINT PUBLIC.FK97D36661777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.FK38B45E734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.FK69FBDD37777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_CREDIT ADD CONSTRAINT PUBLIC.FKADC940089D97CB FOREIGN KEY(POLYTOMOUSKEY_ID) REFERENCES PUBLIC.POLYTOMOUSKEY(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKDC75C70F3A6735D9 FOREIGN KEY(SOURCES_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FK1306FAAF34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_MARKER_AUD ADD CONSTRAINT PUBLIC.FKC6FB487334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_MARKER_AUD ADD CONSTRAINT PUBLIC.FKC6FB487334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.GATHERINGEVENT ADD CONSTRAINT PUBLIC.FK6F1286F33DA462D5 FOREIGN KEY(ACTOR_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.LANGUAGESTRING_ANNOTATION ADD CONSTRAINT PUBLIC.FK8400DFA51E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_REPRESENTATION ADD CONSTRAINT PUBLIC.FKAAC8AFE6B31C4747 FOREIGN KEY(REPRESENTATIONS_ID) REFERENCES PUBLIC.REPRESENTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.KEYSTATEMENT_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK70BB5FD8DA0C376A FOREIGN KEY(LABEL_MAPKEY_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.AGENTBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK4FDFF8D134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.AGENTBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK4FDFF8D134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.MEDIAKEY_SCOPE ADD CONSTRAINT PUBLIC.FKBFFEE8F0546985E4 FOREIGN KEY(SCOPERESTRICTIONS_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TERMVOCABULARY_REPRESENTATION ADD CONSTRAINT PUBLIC.FKA408B63A258E060 FOREIGN KEY(TERMVOCABULARY_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF ADD CONSTRAINT PUBLIC.FK56833D0152FCC4B FOREIGN KEY(FEATURENODE_ID) REFERENCES PUBLIC.FEATURENODE(ID) NOCHECK;
@@ -5407,7 +5339,7 @@ ALTER TABLE PUBLIC.COLLECTION_MEDIA_AUD ADD CONSTRAINT PUBLIC.FK9AABDB5434869AAE
 ALTER TABLE PUBLIC.DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.FKDE29CD8033B8A841 FOREIGN KEY(SPECIMEN_ID) REFERENCES PUBLIC.SPECIMENOROBSERVATIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.STATEDATA_AUD ADD CONSTRAINT PUBLIC.FKDA6A700C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.FK21CA3272C8505DB FOREIGN KEY(PRESERVATION_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.MEDIA_RIGHTS ADD CONSTRAINT PUBLIC.FKDB1266D2C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.MEDIA_RIGHTSINFO ADD CONSTRAINT PUBLIC.FKDB1266D2C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.CREDIT ADD CONSTRAINT PUBLIC.FK78CA9719F7976FC5 FOREIGN KEY(AGENT_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.WORKINGSET_MARKER_AUD ADD CONSTRAINT PUBLIC.FK6AEAB69934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONINTERACTION_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK579A1DC028459272 FOREIGN KEY(DESCRIPTION_MAPKEY_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
@@ -5430,7 +5362,7 @@ ALTER TABLE PUBLIC.TAXONNAMEBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKF746
 ALTER TABLE PUBLIC.MEDIAREPRESENTATIONPART ADD CONSTRAINT PUBLIC.FK67A455444FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.NAMERELATIONSHIP ADD CONSTRAINT PUBLIC.FK5E51083BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FK839208C43A6735D9 FOREIGN KEY(SOURCES_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.FKB0BD86D318929176 FOREIGN KEY(ROOTNODES_ID) REFERENCES PUBLIC.TAXONNODE(ID) NOCHECK;
+--ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.FKB0BD86D318929176 FOREIGN KEY(ROOTNODES_ID) REFERENCES PUBLIC.TAXONNODE(ID) NOCHECK;
 ALTER TABLE PUBLIC.LANGUAGESTRING ADD CONSTRAINT PUBLIC.FKB5FDC9A94FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_CREDIT ADD CONSTRAINT PUBLIC.FK29BCD8B232D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY ADD CONSTRAINT PUBLIC.FKA9E6B1384FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5450,8 +5382,8 @@ ALTER TABLE PUBLIC.GATHERINGEVENT_ANNOTATION ADD CONSTRAINT PUBLIC.FK76DDD01BF95
 ALTER TABLE PUBLIC.SEQUENCE_REFERENCE ADD CONSTRAINT PUBLIC.FK6944904DD57FFDD5 FOREIGN KEY(SEQUENCE_ID) REFERENCES PUBLIC.SEQUENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.PERMISSIONGROUP ADD CONSTRAINT PUBLIC.FK629941D04FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FK7AE0176334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.TAXONBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK65CF621BC13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.FK91E56DF7E8D36B00 FOREIGN KEY(LANGUAGE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.TAXONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK65CF621BC13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.FK91E56DF7E8D36B00 FOREIGN KEY(LANGUAGE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.KEYSTATEMENT ADD CONSTRAINT PUBLIC.FK7125B9F04FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DERIVATIONEVENT ADD CONSTRAINT PUBLIC.FK426BC033DA462D5 FOREIGN KEY(ACTOR_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_REPRESENTATION_AUD ADD CONSTRAINT PUBLIC.FKB5AE7AB734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5465,10 +5397,10 @@ ALTER TABLE PUBLIC.TAXONNODE_ANNOTATION ADD CONSTRAINT PUBLIC.FKD8A9A9A21E403E0B
 ALTER TABLE PUBLIC.TAXONNAMEBASE_EXTENSION ADD CONSTRAINT PUBLIC.FKC28EE7E68C85CF94 FOREIGN KEY(TAXONNAMEBASE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_CREDIT_AUD ADD CONSTRAINT PUBLIC.FK4AD9EDFE34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE ADD CONSTRAINT PUBLIC.FK404D5F2B4FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.FK91E56DF7BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.FK91E56DF7BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION ADD CONSTRAINT PUBLIC.FKF078ABEBC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_TAXONBASE_AUD ADD CONSTRAINT PUBLIC.FK857187B134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK3296F9AF34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK3296F9AF34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_MEDIA ADD CONSTRAINT PUBLIC.FKBBEF5B0C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIAKEY_TAXON ADD CONSTRAINT PUBLIC.FKC00C3966815C7E9 FOREIGN KEY(MEDIAKEY_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEYNODE ADD CONSTRAINT PUBLIC.FK860775A4382686A FOREIGN KEY(STATEMENT_ID) REFERENCES PUBLIC.KEYSTATEMENT(ID) NOCHECK;
@@ -5488,11 +5420,11 @@ ALTER TABLE PUBLIC.DESCRIPTIONBASE_EXTENSION ADD CONSTRAINT PUBLIC.FKD5D2B32D927
 ALTER TABLE PUBLIC.DETERMINATIONEVENT ADD CONSTRAINT PUBLIC.FK1DB2497378D1BD FOREIGN KEY(MODIFIER_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_EXTENSION ADD CONSTRAINT PUBLIC.FKE03B8292927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.FK69FBDD372BD180D9 FOREIGN KEY(TAXONRELATIONSHIP_ID) REFERENCES PUBLIC.TAXONRELATIONSHIP(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_MARKER ADD CONSTRAINT PUBLIC.FKB739BBA2C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
-ALTER TABLE PUBLIC.TAXONBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK4CF70A6C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_MARKER ADD CONSTRAINT PUBLIC.FKB739BBA2C13F7B21 FOREIGN KEY(RIGHTSINFO_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
+ALTER TABLE PUBLIC.TAXONBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK4CF70A6C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MEASUREMENTUNIT ADD CONSTRAINT PUBLIC.FKE9D17767F3BB39BD FOREIGN KEY(RECOMMENDEDMEASUREMENTUNITS_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKCA7F794A3A6735D9 FOREIGN KEY(SOURCES_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTS ADD CONSTRAINT PUBLIC.FK626B785084A3CE1B FOREIGN KEY(CLASSIFICATION_ID) REFERENCES PUBLIC.CLASSIFICATION(ID) NOCHECK;
+ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK626B785084A3CE1B FOREIGN KEY(CLASSIFICATION_ID) REFERENCES PUBLIC.CLASSIFICATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIAREPRESENTATION ADD CONSTRAINT PUBLIC.FK1966BDB1C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_CREDIT_AUD ADD CONSTRAINT PUBLIC.FKD9895D8334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.ANNOTATION ADD CONSTRAINT PUBLIC.FK1A21C74FE8D36B00 FOREIGN KEY(LANGUAGE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
@@ -5510,7 +5442,7 @@ ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.FK7A43906677
 ALTER TABLE PUBLIC.WORKINGSET_MARKER ADD CONSTRAINT PUBLIC.FK9CB22CC8777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_MEDIA_AUD ADD CONSTRAINT PUBLIC.FK20025CB734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE ADD CONSTRAINT PUBLIC.FKB4870C662AD57A2 FOREIGN KEY(EXCOMBINATIONAUTHORTEAM_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK921A01F0C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK921A01F0C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_STATEDATA ADD CONSTRAINT PUBLIC.FK592D6F6D15153604 FOREIGN KEY(STATEDATA_ID) REFERENCES PUBLIC.STATEDATA(ID) NOCHECK;
 ALTER TABLE PUBLIC.INDIVIDUALASSOCIATION_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FKB5C75EC02BEBA58D FOREIGN KEY(DESCRIPTION_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.CLASSIFICATION ADD CONSTRAINT PUBLIC.FKDB110006BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5518,7 +5450,7 @@ ALTER TABLE PUBLIC.DEFINEDTERMBASE_CREDIT ADD CONSTRAINT PUBLIC.FK78FF2B1232D1B9
 ALTER TABLE PUBLIC.HOMOTYPICALGROUP_MARKER ADD CONSTRAINT PUBLIC.FK97D36661BFEAE500 FOREIGN KEY(HOMOTYPICALGROUP_ID) REFERENCES PUBLIC.HOMOTYPICALGROUP(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIAKEY_TAXON ADD CONSTRAINT PUBLIC.FKC00C3966DE9A3E39 FOREIGN KEY(TAXON_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_AUD ADD CONSTRAINT PUBLIC.FKF3803C234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK921A01F0C0DB4934 FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK921A01F0C0DB4934 FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION ADD CONSTRAINT PUBLIC.FKF078ABE16B9CA77 FOREIGN KEY(INSTITUTE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.KEYSTATEMENT_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK70BB5FD89C782795 FOREIGN KEY(LABEL_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP ADD CONSTRAINT PUBLIC.FK7482BA024FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5554,30 +5486,29 @@ ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_MARKER ADD CONSTRAINT PUBLIC.FKB914A10B44
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.FK1E160FB934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION_AUD ADD CONSTRAINT PUBLIC.FKBB04522D34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.ANNOTATION_ANNOTATION ADD CONSTRAINT PUBLIC.FKC99DFE3F994CCE20 FOREIGN KEY(ANNOTATION_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
-ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS ADD CONSTRAINT PUBLIC.FK23F76ADE89D97CB FOREIGN KEY(POLYTOMOUSKEY_ID) REFERENCES PUBLIC.POLYTOMOUSKEY(ID) NOCHECK;
+ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK23F76ADE89D97CB FOREIGN KEY(POLYTOMOUSKEY_ID) REFERENCES PUBLIC.POLYTOMOUSKEY(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FKC753F137ACF5F60B FOREIGN KEY(MULTILANGUAGETEXT_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK20814271B029DDA0 FOREIGN KEY(ORIGINALSOURCEBASE_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK2E340A6624AF3F70 FOREIGN KEY(LEVEL_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_MARKER ADD CONSTRAINT PUBLIC.FKF0CA00FB777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
-ALTER TABLE PUBLIC.COLLECTION_RIGHTS ADD CONSTRAINT PUBLIC.FKF9BDEE98C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.FK91E56DF7F7976FC5 FOREIGN KEY(AGENT_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.COLLECTION_RIGHTSINFO ADD CONSTRAINT PUBLIC.FKF9BDEE98C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.FK91E56DF7F7976FC5 FOREIGN KEY(AGENT_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.LANGUAGESTRING_MARKER ADD CONSTRAINT PUBLIC.FK8DA633B037998500 FOREIGN KEY(LANGUAGESTRING_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_MARKER ADD CONSTRAINT PUBLIC.FK39E3C1F3777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_CREDIT ADD CONSTRAINT PUBLIC.FK5BC6DEAD32D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FK2FEEB6B8C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
-ALTER TABLE PUBLIC.MEDIA_RIGHTS ADD CONSTRAINT PUBLIC.FKDB1266D2C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
+ALTER TABLE PUBLIC.MEDIA_RIGHTSINFO ADD CONSTRAINT PUBLIC.FKDB1266D2C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.TERMVOCABULARY_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FKD522D38334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE ADD CONSTRAINT PUBLIC.FK544ADBE12DBE1F1F FOREIGN KEY(LOCUS_ID) REFERENCES PUBLIC.LOCUS(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FK2FEEB6B83A6735D9 FOREIGN KEY(SOURCES_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_SCOPE ADD CONSTRAINT PUBLIC.FKB9257C42951A5D40 FOREIGN KEY(SCOPES_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA ADD CONSTRAINT PUBLIC.FK4EEBF7B7C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
---ALTER TABLE PUBLIC.SEQUENCE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK1B1ABB6634869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+--ALTER TABLE PUBLIC.SEQUENCE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK1B1ABB6634869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FK1DF60C5C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP ADD CONSTRAINT PUBLIC.FK9033CE749DD57A93 FOREIGN KEY(RELATEDFROM_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKB482C5E686EFC5D4 FOREIGN KEY(AGENTBASE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK2E340A6647AF954C FOREIGN KEY(VOCABULARY_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_EXTENSION ADD CONSTRAINT PUBLIC.FKF961257B9C9D39 FOREIGN KEY(TAXONBASE_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTS ADD CONSTRAINT PUBLIC.FK8F1F9C44C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK8F1F9C44C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.TERMVOCABULARY_REPRESENTATION ADD CONSTRAINT PUBLIC.FKA408B63AB31C4747 FOREIGN KEY(REPRESENTATIONS_ID) REFERENCES PUBLIC.REPRESENTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY ADD CONSTRAINT PUBLIC.FKA9E6B138BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKA074CFC234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5598,10 +5529,10 @@ ALTER TABLE PUBLIC.SEQUENCE ADD CONSTRAINT PUBLIC.FK544ADBE14FF2DB2C FOREIGN KEY
 ALTER TABLE PUBLIC.AGENTBASE_CONTACT_URLS ADD CONSTRAINT PUBLIC.FK9A9643EC86EFC5D4 FOREIGN KEY(AGENTBASE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE ADD CONSTRAINT PUBLIC.FK4CF19F94BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.PERMISSIONGROUP_GRANTEDAUTHORITYIMPL ADD CONSTRAINT PUBLIC.FK5311437CA0971A3 FOREIGN KEY(PERMISSIONGROUP_ID) REFERENCES PUBLIC.PERMISSIONGROUP(ID) NOCHECK;
-ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.FKB0BD86D384A3CE1B FOREIGN KEY(CLASSIFICATION_ID) REFERENCES PUBLIC.CLASSIFICATION(ID) NOCHECK;
+--ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE ADD CONSTRAINT PUBLIC.FKB0BD86D384A3CE1B FOREIGN KEY(CLASSIFICATION_ID) REFERENCES PUBLIC.CLASSIFICATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKF746D2763A6735D9 FOREIGN KEY(SOURCES_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP ADD CONSTRAINT PUBLIC.FK7482BA02F8991B9D FOREIGN KEY(RELATEDTO_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.FEATURETREE_RIGHTS ADD CONSTRAINT PUBLIC.FK8E50DD0247C496CB FOREIGN KEY(FEATURETREE_ID) REFERENCES PUBLIC.FEATURETREE(ID) NOCHECK;
+ALTER TABLE PUBLIC.FEATURETREE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK8E50DD0247C496CB FOREIGN KEY(FEATURETREE_ID) REFERENCES PUBLIC.FEATURETREE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKD3E2F9AC34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_MARKER ADD CONSTRAINT PUBLIC.FK5CDB747E9C9D39 FOREIGN KEY(TAXONBASE_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FK71381DCC34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5611,11 +5542,11 @@ ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_LANGUAGESTRING_AUD ADD CONSTRAINT PUBL
 ALTER TABLE PUBLIC.WORKINGSET_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK1E28140E34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_EXTENSION ADD CONSTRAINT PUBLIC.FKF68FEBDE927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_MEDIA ADD CONSTRAINT PUBLIC.FK8E5D91E6D57FFDD5 FOREIGN KEY(SEQUENCE_ID) REFERENCES PUBLIC.SEQUENCE(ID) NOCHECK;
-ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK42D7AF908C85CF94 FOREIGN KEY(TAXONNAMEBASE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK42D7AF908C85CF94 FOREIGN KEY(TAXONNAMEBASE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNODE ADD CONSTRAINT PUBLIC.FK924F5BCCCC05993E FOREIGN KEY(SYNONYMTOBEUSED_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_CREDIT ADD CONSTRAINT PUBLIC.FK4CB48B3D32D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.FK82C86DAC2BD180D9 FOREIGN KEY(TAXONRELATIONSHIP_ID) REFERENCES PUBLIC.TAXONRELATIONSHIP(ID) NOCHECK;
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY ADD CONSTRAINT PUBLIC.FKCAF4393CE5C0F9E FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY ADD CONSTRAINT PUBLIC.FKCAF4393CE5C0F9E FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.CLASSIFICATION_ANNOTATION ADD CONSTRAINT PUBLIC.FKC978FD2884A3CE1B FOREIGN KEY(CLASSIFICATION_ID) REFERENCES PUBLIC.CLASSIFICATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MODIFYINGTEXT ADD CONSTRAINT PUBLIC.FK522D90C73B8BB609 FOREIGN KEY(DESCRIPTIONELEMENTBASE_ID) REFERENCES PUBLIC.DESCRIPTIONELEMENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_EXTENSION ADD CONSTRAINT PUBLIC.FKAE34C1D8927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
@@ -5624,7 +5555,7 @@ ALTER TABLE PUBLIC.TAXONNAMEBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKB6734E39
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_EXTENSION ADD CONSTRAINT PUBLIC.FK397EF986C0DB4934 FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONINTERACTION_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK579A1DC02BEBA58D FOREIGN KEY(DESCRIPTION_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_TAXON ADD CONSTRAINT PUBLIC.FK8DA4E8E3DE9A3E39 FOREIGN KEY(TAXON_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK1093B7C134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK1093B7C134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNODE_MARKER_AUD ADD CONSTRAINT PUBLIC.FK77D9D37E34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_CONTINENT_AUD ADD CONSTRAINT PUBLIC.FKF5DE434C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_AUD ADD CONSTRAINT PUBLIC.FK5CA2CB9734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5635,13 +5566,12 @@ ALTER TABLE PUBLIC.DEFINEDTERMBASE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FK6E6F457
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_STATISTICALMEASURE ADD CONSTRAINT PUBLIC.FK6FF15DFCC9CD5B57 FOREIGN KEY(RECOMMENDEDSTATISTICALMEASURES_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_STATEDATA ADD CONSTRAINT PUBLIC.FK592D6F6D987CC6A4 FOREIGN KEY(DESCRIPTIONELEMENTBASE_ID) REFERENCES PUBLIC.DESCRIPTIONELEMENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.USERACCOUNT_PERMISSIONGROUP ADD CONSTRAINT PUBLIC.FK812DE753DA9DCB5F FOREIGN KEY(GROUPS_ID) REFERENCES PUBLIC.PERMISSIONGROUP(ID) NOCHECK;
---ALTER TABLE PUBLIC.SEQUENCE_RIGHTS ADD CONSTRAINT PUBLIC.FK4616A015D57FFDD5 FOREIGN KEY(SEQUENCE_ID) REFERENCES PUBLIC.SEQUENCE(ID) NOCHECK;
+--ALTER TABLE PUBLIC.SEQUENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK4616A015D57FFDD5 FOREIGN KEY(SEQUENCE_ID) REFERENCES PUBLIC.SEQUENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK353DB784C2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.STATISTICALMEASUREMENTVALUE_DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK686C42B7E0960EC4 FOREIGN KEY(MODIFIERS_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNODE ADD CONSTRAINT PUBLIC.FK924F5BCC4FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.FKA4B9E0A434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.CLASSIFICATION ADD CONSTRAINT PUBLIC.FKDB1100064FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA_AUD ADD CONSTRAINT PUBLIC.FK8457720834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.RELATIONSHIPTERMBASE_INVERSEREPRESENTATION_AUD ADD CONSTRAINT PUBLIC.FK5D248B8434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.FKD58E791834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_CONTINENT ADD CONSTRAINT PUBLIC.FK45F60AFB3927C853 FOREIGN KEY(CONTINENTS_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
@@ -5679,11 +5609,11 @@ ALTER TABLE PUBLIC.INSTITUTIONALMEMBERSHIP ADD CONSTRAINT PUBLIC.FK3C8E1FF9BC5DA
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_MARKER_AUD ADD CONSTRAINT PUBLIC.FK567F2DD334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.CREDIT ADD CONSTRAINT PUBLIC.FK78CA9719E8D36B00 FOREIGN KEY(LANGUAGE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.FK21CA3272F95F225A FOREIGN KEY(GATHERINGEVENT_ID) REFERENCES PUBLIC.GATHERINGEVENT(ID) NOCHECK;
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY_AUD ADD CONSTRAINT PUBLIC.FKD5996FE434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY_AUD ADD CONSTRAINT PUBLIC.FKD5996FE434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKDC75C70FF1DDBFAB FOREIGN KEY(DESCRIPTIONBASE_ID) REFERENCES PUBLIC.DESCRIPTIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.GATHERINGEVENT_MARKER ADD CONSTRAINT PUBLIC.FK7B49CF26777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.HOMOTYPICALGROUP_AUD ADD CONSTRAINT PUBLIC.FKE4252DE934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.DEFINEDTERMBASE_WATERBODYORCOUNTRY ADD CONSTRAINT PUBLIC.FKCAF43931603B036 FOREIGN KEY(WATERBODIESORCOUNTRIES_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.DEFINEDTERMBASE_COUNTRY ADD CONSTRAINT PUBLIC.FKCAF43931603B036 FOREIGN KEY(COUNTRIES_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP ADD CONSTRAINT PUBLIC.FK9033CE74AF4F9F62 FOREIGN KEY(RELATEDTO_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEYNODE ADD CONSTRAINT PUBLIC.FK860775A9D3C2E93 FOREIGN KEY(QUESTION_ID) REFERENCES PUBLIC.KEYSTATEMENT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_FEATURE_AUD ADD CONSTRAINT PUBLIC.FKA4D7D13534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5695,9 +5625,9 @@ ALTER TABLE PUBLIC.TERMVOCABULARY_CREDIT ADD CONSTRAINT PUBLIC.FK7604C566258E060
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP ADD CONSTRAINT PUBLIC.FK9033CE74BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DETERMINATIONEVENT ADD CONSTRAINT PUBLIC.FK1DB24974FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.ANNOTATION_MARKER ADD CONSTRAINT PUBLIC.FKB17EAF4A994CCE20 FOREIGN KEY(ANNOTATION_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
-ALTER TABLE PUBLIC.COLLECTION_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FKF5A1106934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.COLLECTION_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FKF5A1106934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.CLASSIFICATION_EXTENSION ADD CONSTRAINT PUBLIC.FK715D672684A3CE1B FOREIGN KEY(CLASSIFICATION_ID) REFERENCES PUBLIC.CLASSIFICATION(ID) NOCHECK;
-ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE_AUD ADD CONSTRAINT PUBLIC.FK7654132434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+--ALTER TABLE PUBLIC.CLASSIFICATION_TAXONNODE_AUD ADD CONSTRAINT PUBLIC.FK7654132434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.MARKER ADD CONSTRAINT PUBLIC.FK88F1805ABC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE_CREDIT ADD CONSTRAINT PUBLIC.FK7536062447C496CB FOREIGN KEY(FEATURETREE_ID) REFERENCES PUBLIC.FEATURETREE(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE_ANNOTATION ADD CONSTRAINT PUBLIC.FK5D8B8DA1E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
@@ -5730,14 +5660,14 @@ ALTER TABLE PUBLIC.COLLECTION_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKA0CE0541348
 ALTER TABLE PUBLIC.WORKINGSET_REPRESENTATION ADD CONSTRAINT PUBLIC.FKA003835BB31C4747 FOREIGN KEY(REPRESENTATIONS_ID) REFERENCES PUBLIC.REPRESENTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_MEDIA_AUD ADD CONSTRAINT PUBLIC.FK323A45EC34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE_MARKER ADD CONSTRAINT PUBLIC.FKB3FFDC7CB029DDA0 FOREIGN KEY(ORIGINALSOURCEBASE_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTS ADD CONSTRAINT PUBLIC.FK23F76ADEC13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.POLYTOMOUSKEY_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK23F76ADEC13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.KEYSTATEMENT_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.FKE203E1A934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_MARKER ADD CONSTRAINT PUBLIC.FKB914A10B777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE ADD CONSTRAINT PUBLIC.FK9249B49B8492378F FOREIGN KEY(NAME_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONINTERACTION_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.FK9E016B9134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.WORKINGSET_MARKER ADD CONSTRAINT PUBLIC.FK9CB22CC8BBD2C869 FOREIGN KEY(WORKINGSET_ID) REFERENCES PUBLIC.WORKINGSET(ID) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_MEDIA ADD CONSTRAINT PUBLIC.FKE8FC5D9B86EFC5D4 FOREIGN KEY(AGENTBASE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK81DC081534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK81DC081534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.USERACCOUNT_GRANTEDAUTHORITYIMPL ADD CONSTRAINT PUBLIC.FKFD724D851857F6C2 FOREIGN KEY(GRANTEDAUTHORITIES_ID) REFERENCES PUBLIC.GRANTEDAUTHORITYIMPL(ID) NOCHECK;
 ALTER TABLE PUBLIC.LANGUAGESTRING_MARKER ADD CONSTRAINT PUBLIC.FK8DA633B0777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.GATHERINGEVENT_MARKER_AUD ADD CONSTRAINT PUBLIC.FK160DF9F734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5782,7 +5712,7 @@ ALTER TABLE PUBLIC.REPRESENTATION ADD CONSTRAINT PUBLIC.FK9C4724ED4FF2DB2C FOREI
 ALTER TABLE PUBLIC.FEATURETREE_MARKER ADD CONSTRAINT PUBLIC.FK855CEF65777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY ADD CONSTRAINT PUBLIC.FKA9E6B138576595C3 FOREIGN KEY(ROOT_ID) REFERENCES PUBLIC.POLYTOMOUSKEYNODE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP ADD CONSTRAINT PUBLIC.FKF483ADB3F8991B9D FOREIGN KEY(RELATEDTO_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FKD482FE2134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FKD482FE2134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_TAXONBASE ADD CONSTRAINT PUBLIC.FK1ABD49E07C3D0017 FOREIGN KEY(COVEREDTAXA_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKCDB0237BD57FFDD5 FOREIGN KEY(SEQUENCE_ID) REFERENCES PUBLIC.SEQUENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DERIVATIONEVENT_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKA197815C34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5803,10 +5733,10 @@ ALTER TABLE PUBLIC.DERIVATIONEVENT_MARKER ADD CONSTRAINT PUBLIC.FKE412C8164AAB41
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MARKER ADD CONSTRAINT PUBLIC.FK1CB715E8777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.FKB7C811D234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKDCC094D63A6735D9 FOREIGN KEY(SOURCES_ID) REFERENCES PUBLIC.ORIGINALSOURCEBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.FEATURETREE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK10E2B9D334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.FEATURETREE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK10E2B9D334869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_MEDIA ADD CONSTRAINT PUBLIC.FK6FC908ABC2C29593 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK28ED409934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.REFERENCE_RIGHTS ADD CONSTRAINT PUBLIC.FK74E1B58B8D0FB4DA FOREIGN KEY(REFERENCE_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
+ALTER TABLE PUBLIC.REFERENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK74E1B58B8D0FB4DA FOREIGN KEY(REFERENCE_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_REFERENCE_AUD ADD CONSTRAINT PUBLIC.FK6255A1D434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_AUD ADD CONSTRAINT PUBLIC.FK7456581E34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE ADD CONSTRAINT PUBLIC.FK1205D356BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5824,14 +5754,14 @@ ALTER TABLE PUBLIC.SEQUENCE_MARKER ADD CONSTRAINT PUBLIC.FK3D22B278777265A1 FORE
 ALTER TABLE PUBLIC.CDM_VIEW_CDM_VIEW ADD CONSTRAINT PUBLIC.FK230A885FC00D1213 FOREIGN KEY(CDM_VIEW_ID) REFERENCES PUBLIC.CDM_VIEW(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK7EE5E5DD3B8BB609 FOREIGN KEY(DESCRIPTIONELEMENTBASE_ID) REFERENCES PUBLIC.DESCRIPTIONELEMENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK1A6BB5A034869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.AGENTBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK3F514B0086EFC5D4 FOREIGN KEY(AGENTBASE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.AGENTBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK3F514B0086EFC5D4 FOREIGN KEY(AGENTBASE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP ADD CONSTRAINT PUBLIC.FKF483ADB3BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_ANNOTATION ADD CONSTRAINT PUBLIC.FK4D7327801E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE ADD CONSTRAINT PUBLIC.FK38FE76719108D9B FOREIGN KEY(TAXON2_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_CREDIT ADD CONSTRAINT PUBLIC.FK5BC6DEAD8D0FB4DA FOREIGN KEY(REFERENCE_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
-ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTS ADD CONSTRAINT PUBLIC.FK626B7850C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.CLASSIFICATION_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK626B7850C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.WORKINGSET_AUD ADD CONSTRAINT PUBLIC.FK628F58E234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_ANNOTATION ADD CONSTRAINT PUBLIC.FK27CB1E97C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_ANNOTATION ADD CONSTRAINT PUBLIC.FK27CB1E97C13F7B21 FOREIGN KEY(RIGHTSINFO_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_CONTACT_FAXNUMBERS ADD CONSTRAINT PUBLIC.FK52E1AD9586EFC5D4 FOREIGN KEY(AGENTBASE_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.NOMENCLATURALSTATUS_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK6A3D3D434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FKF128E10534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5841,7 +5771,7 @@ ALTER TABLE PUBLIC.MULTIACCESSKEY_NAMEDAREA_AUD ADD CONSTRAINT PUBLIC.FK4CB735DA
 ALTER TABLE PUBLIC.WORKINGSET_DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.FK731CC81F33B8A841 FOREIGN KEY(DESCRIPTIONS_ID) REFERENCES PUBLIC.DESCRIPTIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_MARKER ADD CONSTRAINT PUBLIC.FK5C475102777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE_AUD ADD CONSTRAINT PUBLIC.FK355BE36534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FKA981956134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FKA981956134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE ADD CONSTRAINT PUBLIC.FK38FE76711C3C3FF7 FOREIGN KEY(AREA_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SEQUENCE_REFERENCE ADD CONSTRAINT PUBLIC.FK6944904D1DDDC219 FOREIGN KEY(CITATIONS_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.NOMENCLATURALSTATUS ADD CONSTRAINT PUBLIC.FK1FFEC88B4FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5854,12 +5784,12 @@ ALTER TABLE PUBLIC.TERMVOCABULARY_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK222D46E
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_MARKER_AUD ADD CONSTRAINT PUBLIC.FK93C51B3734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT ADD CONSTRAINT PUBLIC.FK20132036BD59A1AD FOREIGN KEY(DERIVATIONEVENTS_ID) REFERENCES PUBLIC.DERIVATIONEVENT(ID) NOCHECK;
 ALTER TABLE PUBLIC.INSTITUTIONALMEMBERSHIP ADD CONSTRAINT PUBLIC.FK3C8E1FF9AAC1B820 FOREIGN KEY(PERSON_ID) REFERENCES PUBLIC.AGENTBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.COLLECTION_RIGHTS ADD CONSTRAINT PUBLIC.FKF9BDEE98EB62BE9A FOREIGN KEY(COLLECTION_ID) REFERENCES PUBLIC.COLLECTION(ID) NOCHECK;
+ALTER TABLE PUBLIC.COLLECTION_RIGHTSINFO ADD CONSTRAINT PUBLIC.FKF9BDEE98EB62BE9A FOREIGN KEY(COLLECTION_ID) REFERENCES PUBLIC.COLLECTION(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIAKEY_SCOPE_AUD ADD CONSTRAINT PUBLIC.FK63AD1EC134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_ANNOTATION ADD CONSTRAINT PUBLIC.FKEA970F70EB62BE9A FOREIGN KEY(COLLECTION_ID) REFERENCES PUBLIC.COLLECTION(ID) NOCHECK;
 ALTER TABLE PUBLIC.DETERMINATIONEVENT_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKAFDA5E4834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.RELATIONSHIPTERMBASE_INVERSEREPRESENTATION ADD CONSTRAINT PUBLIC.FK98592F33473FB677 FOREIGN KEY(INVERSEREPRESENTATIONS_ID) REFERENCES PUBLIC.REPRESENTATION(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_MARKER ADD CONSTRAINT PUBLIC.FKB739BBA2777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_MARKER ADD CONSTRAINT PUBLIC.FKB739BBA2777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE ADD CONSTRAINT PUBLIC.FK8AC9DCAEAEB7F3BE FOREIGN KEY(CITATION_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE ADD CONSTRAINT PUBLIC.FK4CF19F944FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.FK82C86DAC1E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
@@ -5880,7 +5810,7 @@ ALTER TABLE PUBLIC.DESCRIPTIONBASE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK15FE77
 ALTER TABLE PUBLIC.GATHERINGEVENT ADD CONSTRAINT PUBLIC.FK6F1286F3BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_SCOPE ADD CONSTRAINT PUBLIC.FKB9257C42D86445CE FOREIGN KEY(DESCRIPTIONBASE_ID) REFERENCES PUBLIC.DESCRIPTIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_ANNOTATION ADD CONSTRAINT PUBLIC.FKA020DAAA1E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
-ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK42D7AF90C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.TAXONNAMEBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK42D7AF90C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.WORKINGSET_ANNOTATION ADD CONSTRAINT PUBLIC.FKCBBA8CBD1E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURENODE ADD CONSTRAINT PUBLIC.FK4CEED9F84FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_CREDIT ADD CONSTRAINT PUBLIC.FK2CFBC93732D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
@@ -5897,7 +5827,7 @@ ALTER TABLE PUBLIC.NOMENCLATURALSTATUS_MARKER ADD CONSTRAINT PUBLIC.FK2F5128E777
 ALTER TABLE PUBLIC.STATEDATA_DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK107321E28E7BF9AB FOREIGN KEY(STATEDATA_ID) REFERENCES PUBLIC.STATEDATA(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURENODE_AUD ADD CONSTRAINT PUBLIC.FK25AD4BC934869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.WORKINGSET ADD CONSTRAINT PUBLIC.FK668D5B91BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
-ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTS ADD CONSTRAINT PUBLIC.FK8F1F9C44258E060 FOREIGN KEY(TERMVOCABULARY_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
+ALTER TABLE PUBLIC.TERMVOCABULARY_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK8F1F9C44258E060 FOREIGN KEY(TERMVOCABULARY_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
 ALTER TABLE PUBLIC.HYBRIDRELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.FK2C7E7DFA1E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIAREPRESENTATION_MEDIAREPRESENTATIONPART_AUD ADD CONSTRAINT PUBLIC.FK3544378734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_MODIFYINGTEXT_AUD ADD CONSTRAINT PUBLIC.FK6C06031834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5905,7 +5835,7 @@ ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_SEQUENCE_AUD ADD CONSTRAINT PUBLIC.
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FKCFAA93168028C309 FOREIGN KEY(DEFINITION_MAPKEY_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.FK21CA3272BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.LSIDAUTHORITY ADD CONSTRAINT PUBLIC.FK759DB8814FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
-ALTER TABLE PUBLIC.AGENTBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK3F514B00C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.AGENTBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK3F514B00C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE ADD CONSTRAINT PUBLIC.FK21CA3272156CF96 FOREIGN KEY(DERIVEDFROM_ID) REFERENCES PUBLIC.DERIVATIONEVENT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.FKE11D334F34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.FKC025854234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5928,10 +5858,10 @@ ALTER TABLE PUBLIC.MARKER_AUD ADD CONSTRAINT PUBLIC.FKB951F12B34869AAE FOREIGN K
 ALTER TABLE PUBLIC.TAXONNODE_MARKER ADD CONSTRAINT PUBLIC.FK395842D777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
 ALTER TABLE PUBLIC.STATISTICALMEASUREMENTVALUE ADD CONSTRAINT PUBLIC.FK2DCE02904FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.RELATIONSHIPTERMBASE_INVERSEREPRESENTATION ADD CONSTRAINT PUBLIC.FK98592F33ECEEF4AF FOREIGN KEY(DEFINEDTERMBASE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK6A2601A9F1DDBFAB FOREIGN KEY(DESCRIPTIONBASE_ID) REFERENCES PUBLIC.DESCRIPTIONBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK6A2601A9F1DDBFAB FOREIGN KEY(DESCRIPTIONBASE_ID) REFERENCES PUBLIC.DESCRIPTIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.REPRESENTATION ADD CONSTRAINT PUBLIC.FK9C4724EDE8D36B00 FOREIGN KEY(LANGUAGE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP ADD CONSTRAINT PUBLIC.FK7482BA02E71EF6CE FOREIGN KEY(RELATEDFROM_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.FK91E56DF74FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.FK91E56DF74FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FK505F2E5D966B96B2 FOREIGN KEY(NAMEUSEDINSOURCE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_CREDIT_AUD ADD CONSTRAINT PUBLIC.FK629EC1D134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.WORKINGSET_REPRESENTATION_AUD ADD CONSTRAINT PUBLIC.FK21B88BAC34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5947,11 +5877,11 @@ ALTER TABLE PUBLIC.TERMVOCABULARY ADD CONSTRAINT PUBLIC.FK487AA6924FF2DB2C FOREI
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP ADD CONSTRAINT PUBLIC.FKF483ADB3AEB7F3BE FOREIGN KEY(CITATION_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_CREDIT ADD CONSTRAINT PUBLIC.FKE0A317BA32D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE ADD CONSTRAINT PUBLIC.FKB4870C6617E62B3 FOREIGN KEY(NOMENCLATURALREFERENCE_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS ADD CONSTRAINT PUBLIC.FK9754F4643B8A5ABA FOREIGN KEY(SPECIMENOROBSERVATIONBASE_ID) REFERENCES PUBLIC.SPECIMENOROBSERVATIONBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK9754F4643B8A5ABA FOREIGN KEY(SPECIMENOROBSERVATIONBASE_ID) REFERENCES PUBLIC.SPECIMENOROBSERVATIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_DESCRIPTION ADD CONSTRAINT PUBLIC.FK368283E12BEBA58D FOREIGN KEY(DESCRIPTION_ID) REFERENCES PUBLIC.LANGUAGESTRING(ID) NOCHECK;
 ALTER TABLE PUBLIC.COLLECTION_AUD ADD CONSTRAINT PUBLIC.FKD6D4298F34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK2E340A66D040DBF0 FOREIGN KEY(PARTOF_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
---ALTER TABLE PUBLIC.SEQUENCE_RIGHTS ADD CONSTRAINT PUBLIC.FK4616A015C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+--ALTER TABLE PUBLIC.SEQUENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK4616A015C13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_AUD ADD CONSTRAINT PUBLIC.FKF70B2B9534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 --ALTER TABLE PUBLIC.SEQUENCE_EXTENSION_AUD ADD CONSTRAINT PUBLIC.FK1CA8129234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.KEYSTATEMENT_AUD ADD CONSTRAINT PUBLIC.FK93036FC134869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
@@ -5967,7 +5897,7 @@ ALTER TABLE PUBLIC.TAXONBASE_CREDIT_AUD ADD CONSTRAINT PUBLIC.FK7CFED28E34869AAE
 ALTER TABLE PUBLIC.TAXONNAMEBASE ADD CONSTRAINT PUBLIC.FKB4870C64FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.MULTIACCESSKEY_TAXON_AUD ADD CONSTRAINT PUBLIC.FKF083E4BE34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.SEQUENCE_ANNOTATION ADD CONSTRAINT PUBLIC.FK1010BA6DD57FFDD5 FOREIGN KEY(SEQUENCE_ID) REFERENCES PUBLIC.SEQUENCE(ID) NOCHECK;
-ALTER TABLE PUBLIC.REFERENCE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK1AD225DC34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.REFERENCE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK1AD225DC34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.AGENTBASE_CREDIT ADD CONSTRAINT PUBLIC.FK2636742232D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
 ALTER TABLE PUBLIC.MULTIACCESSKEY_NAMEDAREA ADD CONSTRAINT PUBLIC.FK1F5A7489B4555A9A FOREIGN KEY(WORKINGSET_ID) REFERENCES PUBLIC.WORKINGSET(ID) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA ADD CONSTRAINT PUBLIC.FK46C7FC4BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -5994,13 +5924,12 @@ ALTER TABLE PUBLIC.FEATURETREE_ANNOTATION ADD CONSTRAINT PUBLIC.FK5D8B8DA47C496C
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FK3281DB8734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_ANNOTATION_AUD ADD CONSTRAINT PUBLIC.FKF3C1293434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_REFERENCE ADD CONSTRAINT PUBLIC.FKC330D6395C601E49 FOREIGN KEY(DESCRIPTIONSOURCES_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_MEDIA ADD CONSTRAINT PUBLIC.FK4EEBF7B73B8A5ABA FOREIGN KEY(SPECIMENOROBSERVATIONBASE_ID) REFERENCES PUBLIC.SPECIMENOROBSERVATIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SEQUENCE ADD CONSTRAINT PUBLIC.FK544ADBE1BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.USERACCOUNT_GRANTEDAUTHORITYIMPL ADD CONSTRAINT PUBLIC.FKFD724D855EA5DD89 FOREIGN KEY(USERACCOUNT_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.TYPEDESIGNATIONBASE_AUD ADD CONSTRAINT PUBLIC.FK243C037F34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONNAMEBASE_NOMENCLATURALSTATUS ADD CONSTRAINT PUBLIC.FK560BA7928C85CF94 FOREIGN KEY(TAXONNAMEBASE_ID) REFERENCES PUBLIC.TAXONNAMEBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.GATHERINGEVENT_DEFINEDTERMBASE_AUD ADD CONSTRAINT PUBLIC.FKB3BBB1EB34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK252BC84834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK252BC84834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.LANGUAGESTRING ADD CONSTRAINT PUBLIC.FKB5FDC9A9E8D36B00 FOREIGN KEY(LANGUAGE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT_AUD ADD CONSTRAINT PUBLIC.FKA4A8430734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TERMVOCABULARY_EXTENSION ADD CONSTRAINT PUBLIC.FKA8814EB2927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
@@ -6030,7 +5959,7 @@ ALTER TABLE PUBLIC.TERMVOCABULARY_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FK8F2
 ALTER TABLE PUBLIC.DESCRIPTIONBASE ADD CONSTRAINT PUBLIC.FKFF4D58CDDE9A3E39 FOREIGN KEY(TAXON_ID) REFERENCES PUBLIC.TAXONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.NOMENCLATURALSTATUS_MARKER_AUD ADD CONSTRAINT PUBLIC.FK8619495F34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.NAMERELATIONSHIP_MARKER ADD CONSTRAINT PUBLIC.FKE3E463967B4CB560 FOREIGN KEY(NAMERELATIONSHIP_ID) REFERENCES PUBLIC.NAMERELATIONSHIP(ID) NOCHECK;
-ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FK4168503534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.SPECIMENOROBSERVATIONBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FK4168503534869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF_AUD ADD CONSTRAINT PUBLIC.FKB8D7025234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FKF41ADEEB3B8BB609 FOREIGN KEY(DESCRIPTIONELEMENTBASE_ID) REFERENCES PUBLIC.DESCRIPTIONELEMENTBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.ADDRESS ADD CONSTRAINT PUBLIC.FK1ED033D4BC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
@@ -6046,7 +5975,7 @@ ALTER TABLE PUBLIC.TAXONNAMEBASE ADD CONSTRAINT PUBLIC.FKB4870C6BFEAE500 FOREIGN
 ALTER TABLE PUBLIC.AGENTBASE_CONTACT_URLS_AUD ADD CONSTRAINT PUBLIC.FK1CE69BBD34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REFERENCE_ANNOTATION ADD CONSTRAINT PUBLIC.FKFC824E38D0FB4DA FOREIGN KEY(REFERENCE_ID) REFERENCES PUBLIC.REFERENCE(ID) NOCHECK;
 ALTER TABLE PUBLIC.CLASSIFICATION_ORIGINALSOURCEBASE_AUD ADD CONSTRAINT PUBLIC.FK48A31E0734869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
-ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTS_AUD ADD CONSTRAINT PUBLIC.FKFEB732FA34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
+ALTER TABLE PUBLIC.DESCRIPTIONBASE_RIGHTSINFO_AUD ADD CONSTRAINT PUBLIC.FKFEB732FA34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.REPRESENTATION ADD CONSTRAINT PUBLIC.FK9C4724EDBC5DA539 FOREIGN KEY(UPDATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_SCOPE ADD CONSTRAINT PUBLIC.FK8D97986D89D97CB FOREIGN KEY(POLYTOMOUSKEY_ID) REFERENCES PUBLIC.POLYTOMOUSKEY(ID) NOCHECK;
 ALTER TABLE PUBLIC.TAXONBASE_MARKER ADD CONSTRAINT PUBLIC.FK5CDB747E777265A1 FOREIGN KEY(MARKERS_ID) REFERENCES PUBLIC.MARKER(ID) NOCHECK;
@@ -6094,7 +6023,7 @@ ALTER TABLE PUBLIC.TAXONNAMEBASE_EXTENSION ADD CONSTRAINT PUBLIC.FKC28EE7E6927DE
 ALTER TABLE PUBLIC.MEDIAKEY_NAMEDAREA ADD CONSTRAINT PUBLIC.FK31E7D402BE59D760 FOREIGN KEY(MEDIA_ID) REFERENCES PUBLIC.MEDIA(ID) NOCHECK;
 ALTER TABLE PUBLIC.SYNONYMRELATIONSHIP_AUD ADD CONSTRAINT PUBLIC.FK8AEBCA0434869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.MEDIA_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK353DB784A0A6EDCE FOREIGN KEY(TITLE_MAPKEY_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
-ALTER TABLE PUBLIC.REFERENCE_RIGHTS ADD CONSTRAINT PUBLIC.FK74E1B58BC13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTS(ID) NOCHECK;
+ALTER TABLE PUBLIC.REFERENCE_RIGHTSINFO ADD CONSTRAINT PUBLIC.FK74E1B58BC13F7B21 FOREIGN KEY(RIGHTS_ID) REFERENCES PUBLIC.RIGHTSINFO(ID) NOCHECK;
 ALTER TABLE PUBLIC.ORIGINALSOURCEBASE ADD CONSTRAINT PUBLIC.FK505F2E5D4FF2DB2C FOREIGN KEY(CREATEDBY_ID) REFERENCES PUBLIC.USERACCOUNT(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_EXTENSION ADD CONSTRAINT PUBLIC.FKD5D2B32DF1DDBFAB FOREIGN KEY(DESCRIPTIONBASE_ID) REFERENCES PUBLIC.DESCRIPTIONBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.FEATURETREE_EXTENSION ADD CONSTRAINT PUBLIC.FKAD1E6D34927DE9DF FOREIGN KEY(EXTENSIONS_ID) REFERENCES PUBLIC.EXTENSION(ID) NOCHECK;
@@ -6130,7 +6059,7 @@ ALTER TABLE PUBLIC.CLASSIFICATION_MARKER ADD CONSTRAINT PUBLIC.FK59778AB384A3CE1
 ALTER TABLE PUBLIC.DEFINEDTERMBASE ADD CONSTRAINT PUBLIC.FK2E340A663B0DA0EF FOREIGN KEY(KINDOF_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEYNODE_LANGUAGESTRING_AUD ADD CONSTRAINT PUBLIC.FKE0D0C7FF34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.CLASSIFICATION_ANNOTATION ADD CONSTRAINT PUBLIC.FKC978FD281E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS ADD CONSTRAINT PUBLIC.FK91E56DF7E6D2886A FOREIGN KEY(TYPE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO ADD CONSTRAINT PUBLIC.FK91E56DF7E6D2886A FOREIGN KEY(TYPE_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_CREDIT ADD CONSTRAINT PUBLIC.FK510B2ACB32D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_TAXON ADD CONSTRAINT PUBLIC.FK8DA4E8E389D97CB FOREIGN KEY(POLYTOMOUSKEY_ID) REFERENCES PUBLIC.POLYTOMOUSKEY(ID) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_SCOPE ADD CONSTRAINT PUBLIC.FK8D97986D546985E4 FOREIGN KEY(SCOPERESTRICTIONS_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;
@@ -6153,7 +6082,7 @@ ALTER TABLE PUBLIC.NAMERELATIONSHIP_ANNOTATION ADD CONSTRAINT PUBLIC.FK2E38AC8B7
 ALTER TABLE PUBLIC.DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION ADD CONSTRAINT PUBLIC.FK2170B25C5AF2C74 FOREIGN KEY(SUPPORTEDCATEGORICALENUMERATIONS_ID) REFERENCES PUBLIC.TERMVOCABULARY(ID) NOCHECK;
 ALTER TABLE PUBLIC.DESCRIPTIONBASE_MARKER_AUD ADD CONSTRAINT PUBLIC.FK92DD5BDD34869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.POLYTOMOUSKEY_CREDIT ADD CONSTRAINT PUBLIC.FKADC940032D1B9F FOREIGN KEY(CREDITS_ID) REFERENCES PUBLIC.CREDIT(ID) NOCHECK;
-ALTER TABLE PUBLIC.RIGHTS_ANNOTATION ADD CONSTRAINT PUBLIC.FK27CB1E971E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
+ALTER TABLE PUBLIC.RIGHTSINFO_ANNOTATION ADD CONSTRAINT PUBLIC.FK27CB1E971E403E0B FOREIGN KEY(ANNOTATIONS_ID) REFERENCES PUBLIC.ANNOTATION(ID) NOCHECK;
 ALTER TABLE PUBLIC.HOMOTYPICALGROUP_MARKER_AUD ADD CONSTRAINT PUBLIC.FK19337BB234869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.TAXONRELATIONSHIP_MARKER_AUD ADD CONSTRAINT PUBLIC.FK21F8978834869AAE FOREIGN KEY(REV) REFERENCES PUBLIC.AUDITEVENT(REVISIONNUMBER) NOCHECK;
 ALTER TABLE PUBLIC.STATEDATA_LANGUAGESTRING ADD CONSTRAINT PUBLIC.FK93FFD2AD9682414B FOREIGN KEY(MODIFYINGTEXT_MAPKEY_ID) REFERENCES PUBLIC.DEFINEDTERMBASE(ID) NOCHECK;