Return-Path: 
 <jdo-commits-return-791-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 86166 invoked from network); 4 Aug 2005 16:50:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 Aug 2005 16:50:56 -0000
Received: (qmail 91784 invoked by uid 500); 4 Aug 2005 16:50:49 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 91708 invoked by uid 99); 4 Aug 2005 16:50:49 -0000
X-ASF-Spam-Status: No, hits=-9.3 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_75_100
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 Aug 2005 09:50:36 -0700
Received: (qmail 85975 invoked by uid 65534); 4 Aug 2005 16:50:33 -0000
Message-ID: <20050804165033.85972.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r227434 [3/3] - in /incubator/jdo/trunk/tck20/test:
 orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
 sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Date: Thu, 04 Aug 2005 16:50:29 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.3
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=227434&r1=227433&r2=227434&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Thu Aug  4 09:50:15 2005
@@ -470,21 +470,15 @@
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE8;
 DROP TABLE MAP_OF_STRING_OBJECT42;
 DROP TABLE MAP_OF_STRING_OBJECT43;
-DROP TABLE MAP_OF_STRING_OBJECT44;
 DROP TABLE MAP_OF_STRING_SIMPLE_CLASS45;
 DROP TABLE MAP_OF_STRING_SIMPLE_CLASS46;
-DROP TABLE MAP_OF_STRING_SIMPLE_CLASS47;
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE48;
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE49;
-DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE50;
 DROP TABLE MAP_OF_STRING_OBJECT84;
-DROP TABLE MAP_OF_STRING_OBJECT85;
 DROP TABLE MAP_OF_STRING_OBJECT86;
 DROP TABLE MAP_OF_STRING_SIMPLE_CLASS87;
-DROP TABLE MAP_OF_STRING_SIMPLE_CLASS88;
 DROP TABLE MAP_OF_STRING_SIMPLE_CLASS89;
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE90;
-DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE91;
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE92;
 DROP TABLE MAP_OF_STRING_STRING95;
 DROP TABLE MAP_OF_STRING_DATE98;
@@ -510,21 +504,15 @@
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE8;
 DROP TABLE HASHMAP_STR_OBJECT42;
 DROP TABLE HASHMAP_STR_OBJECT43;
-DROP TABLE HASHMAP_STR_OBJECT44;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS45;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS46;
-DROP TABLE HASHMAP_STR_SIMPLE_CLASS47;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE48;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE49;
-DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE50;
 DROP TABLE HASHMAP_STR_OBJECT84;
-DROP TABLE HASHMAP_STR_OBJECT85;
 DROP TABLE HASHMAP_STR_OBJECT86;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS87;
-DROP TABLE HASHMAP_STR_SIMPLE_CLASS88;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS89;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE91;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHMAP_STR_STRING95;
 DROP TABLE HASHMAP_STR_DATE98;
@@ -546,25 +534,20 @@
 DROP TABLE MAP_OF_OBJECT4_STRING;
 DROP TABLE MAP_OF_OBJECT5_STRING;
 DROP TABLE MAP_OF_OBJECT6_STRING;
-DROP TABLE MAP_OF_OBJECT7_STRING;
 DROP TABLE MAP_OF_OBJECT8_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS9_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS10_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS11_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS12_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS13_STRING;
-DROP TABLE MAP_OF_SIMPLE_CLASS14_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS15_STRING;
-DROP TABLE MAP_OF_SIMPLE_CLASS16_STRING;
 DROP TABLE MAP_OF_SIMPLE_CLASS17_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE18_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE19_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE20_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE21_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE22_STRING;
-DROP TABLE MAP_OF_SIMPLE_INTERFACE23_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE24_STRING;
-DROP TABLE MAP_OF_SIMPLE_INTERFACE25_STRING;
 DROP TABLE MAP_OF_SIMPLE_INTERFACE26_STRING;
 DROP TABLE MAP_OF_STRING35_STRING;
 DROP TABLE MAP_OF_DATE44_STRING;
@@ -589,21 +572,15 @@
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE8;
 DROP TABLE HASHTBL_STR_OBJECT42;
 DROP TABLE HASHTBL_STR_OBJECT43;
-DROP TABLE HASHTBL_STR_OBJECT44;
 DROP TABLE HASHTBL_STR_SIMPLE_CLASS45;
 DROP TABLE HASHTBL_STR_SIMPLE_CLASS46;
-DROP TABLE HASHTBL_STR_SIMPLE_CLASS47;
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE48;
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE49;
-DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE50;
 DROP TABLE HASHTBL_STR_OBJECT84;
-DROP TABLE HASHTBL_STR_OBJECT85;
 DROP TABLE HASHTBL_STR_OBJECT86;
 DROP TABLE HASHTBL_STR_SIMPLE_CLASS87;
-DROP TABLE HASHTBL_STR_SIMPLE_CLASS88;
 DROP TABLE HASHTBL_STR_SIMPLE_CLASS89;
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE91;
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHTBL_STR_STRING95;
 DROP TABLE HASHTBL_STR_DATE98;
@@ -629,21 +606,15 @@
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE8;
 DROP TABLE TREEMAP_STR_OBJECT42;
 DROP TABLE TREEMAP_STR_OBJECT43;
-DROP TABLE TREEMAP_STR_OBJECT44;
 DROP TABLE TREEMAP_STR_SIMPLE_CLASS45;
 DROP TABLE TREEMAP_STR_SIMPLE_CLASS46;
-DROP TABLE TREEMAP_STR_SIMPLE_CLASS47;
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE48;
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE49;
-DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE50;
 DROP TABLE TREEMAP_STR_OBJECT84;
-DROP TABLE TREEMAP_STR_OBJECT85;
 DROP TABLE TREEMAP_STR_OBJECT86;
 DROP TABLE TREEMAP_STR_SIMPLE_CLASS87;
-DROP TABLE TREEMAP_STR_SIMPLE_CLASS88;
 DROP TABLE TREEMAP_STR_SIMPLE_CLASS89;
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE91;
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE TREEMAP_STR_STRING95;
 DROP TABLE TREEMAP_STR_DATE98;
@@ -663,27 +634,21 @@
 DROP TABLE HASHMAP_OBJECT2_STR;
 DROP TABLE HASHMAP_OBJECT3_STR;
 DROP TABLE HASHMAP_OBJECT4_STR;
-DROP TABLE HASHMAP_OBJECT5_STR;
 DROP TABLE HASHMAP_OBJECT6_STR;
-DROP TABLE HASHMAP_OBJECT7_STR;
 DROP TABLE HASHMAP_OBJECT8_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS9_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS10_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS11_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS12_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS13_STR;
-DROP TABLE HASHMAP_SIMPLE_CLASS14_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS15_STR;
-DROP TABLE HASHMAP_SIMPLE_CLASS16_STR;
 DROP TABLE HASHMAP_SIMPLE_CLASS17_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE18_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE19_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE20_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE21_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE22_STR;
-DROP TABLE HASHMAP_SIMPLE_INTERFACE23_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE24_STR;
-DROP TABLE HASHMAP_SIMPLE_INTERFACE25_STR;
 DROP TABLE HASHMAP_SIMPLE_INTERFACE26_STR;
 DROP TABLE HASHMAP_STRING35_STR;
 DROP TABLE HASHMAP_DATE44_STR;
@@ -704,16 +669,13 @@
 DROP TABLE HASHTBL_OBJECT4_STR;
 DROP TABLE HASHTBL_OBJECT5_STR;
 DROP TABLE HASHTBL_OBJECT6_STR;
-DROP TABLE HASHTBL_OBJECT7_STR;
 DROP TABLE HASHTBL_OBJECT8_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS9_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS10_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS11_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS12_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS13_STR;
-DROP TABLE HASHTBL_SIMPLE_CLASS14_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS15_STR;
-DROP TABLE HASHTBL_SIMPLE_CLASS16_STR;
 DROP TABLE HASHTBL_SIMPLE_CLASS17_STR;
 DROP TABLE HASHTBL_SIMPLE_INTERFACE18_STR;
 DROP TABLE HASHTBL_SIMPLE_INTERFACE19_STR;
@@ -722,7 +684,6 @@
 DROP TABLE HASHTBL_SIMPLE_INTERFACE22_STR;
 DROP TABLE HASHTBL_SIMPLE_INTERFACE23_STR;
 DROP TABLE HASHTBL_SIMPLE_INTERFACE24_STR;
-DROP TABLE HASHTBL_SIMPLE_INTERFACE25_STR;
 DROP TABLE HASHTBL_SIMPLE_INTERFACE26_STR;
 DROP TABLE HASHTBL_STRING35_STR;
 DROP TABLE HASHTBL_DATE44_STR;
@@ -741,27 +702,21 @@
 DROP TABLE TREEMAP_OBJECT2_STR;
 DROP TABLE TREEMAP_OBJECT3_STR;
 DROP TABLE TREEMAP_OBJECT4_STR;
-DROP TABLE TREEMAP_OBJECT5_STR;
 DROP TABLE TREEMAP_OBJECT6_STR;
-DROP TABLE TREEMAP_OBJECT7_STR;
 DROP TABLE TREEMAP_OBJECT8_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS9_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS10_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS11_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS12_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS13_STR;
-DROP TABLE TREEMAP_SIMPLE_CLASS14_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS15_STR;
-DROP TABLE TREEMAP_SIMPLE_CLASS16_STR;
 DROP TABLE TREEMAP_SIMPLE_CLASS17_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE18_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE19_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE20_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE21_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE22_STR;
-DROP TABLE TREEMAP_SIMPLE_INTERFACE23_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE24_STR;
-DROP TABLE TREEMAP_SIMPLE_INTERFACE25_STR;
 DROP TABLE TREEMAP_SIMPLE_INTERFACE26_STR;
 DROP TABLE TREEMAP_STRING35_STR;
 DROP TABLE TREEMAP_DATE44_STR;
@@ -1075,79 +1030,79 @@
 CREATE TABLE FIELDSOFCHARACTER
 (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
-    IDENTIFIER CHAR(1),
-    CHARACTER0 CHAR(1),
-    CHARACTER1 CHAR(1),
-    CHARACTER102 CHAR(1),
-    CHARACTER103 CHAR(1),
-    CHARACTER104 CHAR(1),
-    CHARACTER108 CHAR(1),
-    CHARACTER109 CHAR(1),
-    CHARACTER11 CHAR(1),
-    CHARACTER110 CHAR(1),
-    CHARACTER112 CHAR(1),
-    CHARACTER113 CHAR(1),
-    CHARACTER114 CHAR(1),
-    CHARACTER119 CHAR(1),
-    CHARACTER12 CHAR(1),
-    CHARACTER120 CHAR(1),
-    CHARACTER121 CHAR(1),
-    CHARACTER124 CHAR(1),
-    CHARACTER125 CHAR(1),
-    CHARACTER126 CHAR(1),
-    CHARACTER128 CHAR(1),
-    CHARACTER129 CHAR(1),
-    CHARACTER13 CHAR(1),
-    CHARACTER130 CHAR(1),
-    CHARACTER138 CHAR(1),
-    CHARACTER139 CHAR(1),
-    CHARACTER140 CHAR(1),
-    CHARACTER16 CHAR(1),
-    CHARACTER17 CHAR(1),
-    CHARACTER18 CHAR(1),
-    CHARACTER2 CHAR(1),
-    CHARACTER20 CHAR(1),
-    CHARACTER21 CHAR(1),
-    CHARACTER22 CHAR(1),
-    CHARACTER30 CHAR(1),
-    CHARACTER31 CHAR(1),
-    CHARACTER32 CHAR(1),
-    CHARACTER36 CHAR(1),
-    CHARACTER37 CHAR(1),
-    CHARACTER38 CHAR(1),
-    CHARACTER4 CHAR(1),
-    CHARACTER40 CHAR(1),
-    CHARACTER41 CHAR(1),
-    CHARACTER42 CHAR(1),
-    CHARACTER47 CHAR(1),
-    CHARACTER48 CHAR(1),
-    CHARACTER49 CHAR(1),
-    CHARACTER5 CHAR(1),
-    CHARACTER52 CHAR(1),
-    CHARACTER53 CHAR(1),
-    CHARACTER54 CHAR(1),
-    CHARACTER56 CHAR(1),
-    CHARACTER57 CHAR(1),
-    CHARACTER58 CHAR(1),
-    CHARACTER6 CHAR(1),
-    CHARACTER66 CHAR(1),
-    CHARACTER67 CHAR(1),
-    CHARACTER68 CHAR(1),
-    CHARACTER72 CHAR(1),
-    CHARACTER73 CHAR(1),
-    CHARACTER74 CHAR(1),
-    CHARACTER76 CHAR(1),
-    CHARACTER77 CHAR(1),
-    CHARACTER78 CHAR(1),
-    CHARACTER83 CHAR(1),
-    CHARACTER84 CHAR(1),
-    CHARACTER85 CHAR(1),
-    CHARACTER88 CHAR(1),
-    CHARACTER89 CHAR(1),
-    CHARACTER90 CHAR(1),
-    CHARACTER92 CHAR(1),
-    CHARACTER93 CHAR(1),
-    CHARACTER94 CHAR(1)
+    IDENTIFIER INTEGER,
+    CHARACTER0 INTEGER,
+    CHARACTER1 INTEGER,
+    CHARACTER102 INTEGER,
+    CHARACTER103 INTEGER,
+    CHARACTER104 INTEGER,
+    CHARACTER108 INTEGER,
+    CHARACTER109 INTEGER,
+    CHARACTER11 INTEGER,
+    CHARACTER110 INTEGER,
+    CHARACTER112 INTEGER,
+    CHARACTER113 INTEGER,
+    CHARACTER114 INTEGER,
+    CHARACTER119 INTEGER,
+    CHARACTER12 INTEGER,
+    CHARACTER120 INTEGER,
+    CHARACTER121 INTEGER,
+    CHARACTER124 INTEGER,
+    CHARACTER125 INTEGER,
+    CHARACTER126 INTEGER,
+    CHARACTER128 INTEGER,
+    CHARACTER129 INTEGER,
+    CHARACTER13 INTEGER,
+    CHARACTER130 INTEGER,
+    CHARACTER138 INTEGER,
+    CHARACTER139 INTEGER,
+    CHARACTER140 INTEGER,
+    CHARACTER16 INTEGER,
+    CHARACTER17 INTEGER,
+    CHARACTER18 INTEGER,
+    CHARACTER2 INTEGER,
+    CHARACTER20 INTEGER,
+    CHARACTER21 INTEGER,
+    CHARACTER22 INTEGER,
+    CHARACTER30 INTEGER,
+    CHARACTER31 INTEGER,
+    CHARACTER32 INTEGER,
+    CHARACTER36 INTEGER,
+    CHARACTER37 INTEGER,
+    CHARACTER38 INTEGER,
+    CHARACTER4 INTEGER,
+    CHARACTER40 INTEGER,
+    CHARACTER41 INTEGER,
+    CHARACTER42 INTEGER,
+    CHARACTER47 INTEGER,
+    CHARACTER48 INTEGER,
+    CHARACTER49 INTEGER,
+    CHARACTER5 INTEGER,
+    CHARACTER52 INTEGER,
+    CHARACTER53 INTEGER,
+    CHARACTER54 INTEGER,
+    CHARACTER56 INTEGER,
+    CHARACTER57 INTEGER,
+    CHARACTER58 INTEGER,
+    CHARACTER6 INTEGER,
+    CHARACTER66 INTEGER,
+    CHARACTER67 INTEGER,
+    CHARACTER68 INTEGER,
+    CHARACTER72 INTEGER,
+    CHARACTER73 INTEGER,
+    CHARACTER74 INTEGER,
+    CHARACTER76 INTEGER,
+    CHARACTER77 INTEGER,
+    CHARACTER78 INTEGER,
+    CHARACTER83 INTEGER,
+    CHARACTER84 INTEGER,
+    CHARACTER85 INTEGER,
+    CHARACTER88 INTEGER,
+    CHARACTER89 INTEGER,
+    CHARACTER90 INTEGER,
+    CHARACTER92 INTEGER,
+    CHARACTER93 INTEGER,
+    CHARACTER94 INTEGER
 );
 
 ALTER TABLE FIELDSOFCHARACTER ADD CONSTRAINT FIELDSOFCHAROV_PK PRIMARY KEY (DATASTORE_IDENTITY);
@@ -2974,7 +2929,6 @@
     STRINGVAL VARCHAR(1024)
 );
 
-
 CREATE TABLE COLLECTION_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
@@ -3139,42 +3093,42 @@
 CREATE TABLE LIST_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -3613,42 +3567,42 @@
 CREATE TABLE LINKEDLIST_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -3850,42 +3804,42 @@
 CREATE TABLE VECTOR_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -4066,218 +4020,187 @@
 CREATE TABLE SET_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE SET_OF_STRING11
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE SET_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER
+    DATEVAL DATE
 );
 
 CREATE TABLE SET_OF_DATE14
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER
+    DATEVAL DATE
 );
 
 CREATE TABLE SET_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE SET_OF_LOCALE17
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL20
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE SET_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_BYTE26
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE SET_OF_DOUBLE29
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE SET_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE SET_OF_FLOAT32
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE SET_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE SET_OF_INTEGER35
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE SET_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER
+    LONGVAL BIGINT
 );
 
 CREATE TABLE SET_OF_LONG38
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER
+    LONGVAL BIGINT
 );
 
 CREATE TABLE SET_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER
+    SHORTVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_SHORT41
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER
+    SHORTVAL SMALLINT
 );
 
 --HashSetCollections
@@ -4303,219 +4226,187 @@
 CREATE TABLE HASHSET_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHSET_OF_STRING11
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHSET_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER
+    DATEVAL DATE
 );
 
 CREATE TABLE HASHSET_OF_DATE14
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER
+    DATEVAL DATE
 );
 
 CREATE TABLE HASHSET_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHSET_OF_LOCALE17
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHSET_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
-
 CREATE TABLE HASHSET_OF_BIG_DECIMAL20
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_BYTE26
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE29
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHSET_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHSET_OF_FLOAT32
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHSET_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHSET_OF_INTEGER35
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHSET_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER
+    LONGVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_LONG38
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER
+    LONGVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER
+    SHORTVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_SHORT41
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER
+    SHORTVAL SMALLINT
 );
 
 --TreeSetCollections
@@ -4561,42 +4452,42 @@
 CREATE TABLE TREESET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -4840,306 +4731,225 @@
 CREATE TABLE MAP_OF_STRING_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT42
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_OBJECT44
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS47
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE50
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
-
 CREATE TABLE MAP_OF_STRING_OBJECT84
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_OBJECT85
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT86
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS88
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS89
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE91
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE92
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_STRING95
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE MAP_OF_STRING_DATE98
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    DATEVAL DATE
 );
 
 CREATE TABLE MAP_OF_STRING_LOCALE101
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_DECIMAL104
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER107
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE110
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE MAP_OF_STRING_DOUBLE113
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE MAP_OF_STRING_FLOAT116
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE MAP_OF_STRING_INTEGER119
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE MAP_OF_STRING_LONG122
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    LONGVAL BIGINT
 );
 
 CREATE TABLE MAP_OF_STRING_SHORT125
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SHORTVAL SMALLINT
 );
 
 --HashMapOfStringKeyCollections
@@ -5242,306 +5052,225 @@
 CREATE TABLE HASHMAP_STR_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT42
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_OBJECT44
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_CLASS47
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE50
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
-
 CREATE TABLE HASHMAP_STR_OBJECT84
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_OBJECT85
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT86
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_CLASS88
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS89
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE91
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_STRING95
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHMAP_STR_DATE98
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    DATEVAL DATE
 );
 
 CREATE TABLE HASHMAP_STR_LOCALE101
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHMAP_STR_BIG_DECIMAL104
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER107
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHMAP_STR_BYTE110
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHMAP_STR_DOUBLE113
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHMAP_STR_FLOAT116
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHMAP_STR_INTEGER119
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHMAP_STR_LONG122
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    LONGVAL BIGINT
 );
 
 CREATE TABLE HASHMAP_STR_SHORT125
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SHORTVAL SMALLINT
 );
 
 --HashtableOfStringKeyCollections
@@ -5644,306 +5373,225 @@
 CREATE TABLE HASHTBL_STR_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT42
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_OBJECT44
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_CLASS47
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
-CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE50
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-
 CREATE TABLE HASHTBL_STR_OBJECT84
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_OBJECT85
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT86
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_CLASS88
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS89
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE91
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE92
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_STRING95
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHTBL_STR_DATE98
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    DATEVAL DATE,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    DATEVAL DATE
 );
 
 CREATE TABLE HASHTBL_STR_LOCALE101
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    LOCALEVAL CHAR(20),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHTBL_STR_BIG_DECIMAL104
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BIG_DECIMALVAL DECIMAL(17,6),
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER107
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHTBL_STR_BYTE110
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    BYTEVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHTBL_STR_DOUBLE113
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    DOUBLEVAL DOUBLE,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHTBL_STR_FLOAT116
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    FLOATVAL FLOAT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHTBL_STR_INTEGER119
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    INTEGERVAL INTEGER,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHTBL_STR_LONG122
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    LONGVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    LONGVAL BIGINT
 );
 
 CREATE TABLE HASHTBL_STR_SHORT125
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL INTEGER NOT NULL,
-    SHORTVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    KEYVAL VARCHAR(100) NOT NULL,
+    SHORTVAL SMALLINT
 );
 
 --HashMapOfStringValueCollections
@@ -6036,261 +5684,188 @@
 
 CREATE TABLE HASHMAP_OBJECT0_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_OBJECT1_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_OBJECT2_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_OBJECT3_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_OBJECT4_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_OBJECT5_STR (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_OBJECT6_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_OBJECT7_STR (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_OBJECT8_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS9_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS10_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS11_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS12_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS13_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_SIMPLE_CLASS14_STR (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS15_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_SIMPLE_CLASS16_STR (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_CLASS17_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE18_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE19_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE20_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE21_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE22_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_SIMPLE_INTERFACE23_STR (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE24_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHMAP_SIMPLE_INTERFACE25_STR (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_SIMPLE_INTERFACE26_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHMAP_STRING35_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL VARCHAR(1024),
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHMAP_DATE44_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL DATE,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL DATE
 );
 
 CREATE TABLE HASHMAP_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(17,6),
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL DECIMAL(17,6)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER62_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL BIGINT
 );
 
 CREATE TABLE HASHMAP_BYTE71_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL SMALLINT
 );
 
 CREATE TABLE HASHMAP_DOUBLE80_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL DOUBLE,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL DOUBLE
 );
 
 CREATE TABLE HASHMAP_FLOAT89_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL FLOAT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL FLOAT
 );
 
 CREATE TABLE HASHMAP_INTEGER98_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL INTEGER,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL INTEGER
 );
 
 CREATE TABLE HASHMAP_LONG107_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL BIGINT
 );
 
 CREATE TABLE HASHMAP_SHORT116_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL SMALLINT
 );
 
 --HashtableOfStringValueCollections
@@ -6383,261 +5958,200 @@
 
 CREATE TABLE HASHTBL_OBJECT0_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT1_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT2_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT3_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT4_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT5_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT6_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_OBJECT7_STR (
-    IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_OBJECT8_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS9_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS10_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS11_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS12_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS13_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_SIMPLE_CLASS14_STR (
-    IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS15_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_SIMPLE_CLASS16_STR (
-    IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_CLASS17_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE18_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE19_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE20_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE21_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE22_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE23_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE24_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE HASHTBL_SIMPLE_INTERFACE25_STR (
-    IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_SIMPLE_INTERFACE26_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHTBL_STRING35_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL VARCHAR(1024),
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHTBL_DATE44_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL DATE,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL DATE
 );
 
 CREATE TABLE HASHTBL_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(17,6),
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL DECIMAL(17,6)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER62_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL BIGINT
 );
 
 CREATE TABLE HASHTBL_BYTE71_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL SMALLINT
 );
 
 CREATE TABLE HASHTBL_DOUBLE80_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL DOUBLE,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL DOUBLE
 );
 
 CREATE TABLE HASHTBL_FLOAT89_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL FLOAT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL FLOAT
 );
 
 CREATE TABLE HASHTBL_INTEGER98_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL INTEGER,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL INTEGER
 );
 
 CREATE TABLE HASHTBL_LONG107_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL BIGINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL BIGINT
 );
 
 CREATE TABLE HASHTBL_SHORT116_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYVAL SMALLINT,
-    INDEX INTEGER NOT NULL
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL SMALLINT
 );
 
 --TreeMapOfStringValueCollections
@@ -6730,260 +6244,218 @@
 
 CREATE TABLE TREEMAP_OBJECT0_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_OBJECT1_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_OBJECT2_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_OBJECT3_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_OBJECT4_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE TREEMAP_OBJECT5_STR (
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_OBJECT6_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
-    INDEX INTEGER NOT NULL
-);
-
-CREATE TABLE TREEMAP_OBJECT7_STR (
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_OBJECT8_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
     KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_SIMPLE_CLASS9_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_SIMPLE_CLASS10_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_SIMPLE_CLASS11_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREEMAP_SIMPLE_CLASS12_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
-    VALUEVAL INTEGER NOT NULL,
-    KEYREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,

[... 888 lines stripped ...]