diff --git a/Schema/InstallMIP.cmd b/Schema/InstallMIP.cmd
new file mode 100644
index 0000000..54c19a7
--- /dev/null
+++ b/Schema/InstallMIP.cmd
@@ -0,0 +1,20 @@
+@echo off
+
+if "%1"=="" goto :usage
+if "%2"=="" goto :usage
+if "%3"=="" goto :usage
+if "%4"=="" goto :usage
+if "%5"=="" goto :usage
+
+sqlplus /nolog @InstallMIP %1 %2 %3 %4 %5
+
+InstallSeed %3/%4@%5
+
+goto :done
+
+:usage
+
+echo usage 		InstallMIP sys_name sys_password app_name app_password db_connect_string
+
+
+:done
diff --git a/Schema/InstallMIP.sql b/Schema/InstallMIP.sql
new file mode 100644
index 0000000..c0edb9d
--- /dev/null
+++ b/Schema/InstallMIP.sql
@@ -0,0 +1,11 @@
+connect &1/&2@&5 as sysdba
+
+drop user &3 cascade;
+
+grant connect, resource to &3 identified by &4;
+
+connect &3/&4@&5
+
+@mip
+
+exit
\ No newline at end of file
diff --git a/Schema/InstallSeed.cmd b/Schema/InstallSeed.cmd
index d3c8eeb..cf163b6 100644
--- a/Schema/InstallSeed.cmd
+++ b/Schema/InstallSeed.cmd
@@ -1,43 +1,59 @@
-SET USER=%1
-SET PASSWORD=%2
-SET DB=%3
+@echo off
 
-sqlplus %user%/%password%@%db% @delete_tables
+if "%1"=="" goto :usage
 
-sqlldr %USER%/%PASSWORD%@%DB% control=alty
+sqlplus %1 @delete_tables
 
-sqlldr %USER%/%PASSWORD%@%DB% control=caco
+sqlldr %1 control=alty
 
-sqlldr %USER%/%PASSWORD%@%DB% control=comt
+sqlldr %1 control=caco
 
-sqlldr %USER%/%PASSWORD%@%DB% control=enrt
+sqlldr %1 control=comt
 
-sqlldr %USER%/%PASSWORD%@%DB% control=enst
+sqlldr %1 control=enrt
 
-sqlldr %USER%/%PASSWORD%@%DB% control=enty
+sqlldr %1 control=enst
 
-sqlldr %USER%/%PASSWORD%@%DB% control=fity
+sqlldr %1 control=enty
 
-sqlldr %USER%/%PASSWORD%@%DB% control=hoty
+sqlldr %1 control=fity
 
-sqlldr %USER%/%PASSWORD%@%DB% control=mety
+sqlldr %1 control=hoty
 
-sqlldr %USER%/%PASSWORD%@%DB% control=part
+sqlldr %1 control=mety
 
-sqlldr %USER%/%PASSWORD%@%DB% control=pcmrt
+sqlldr %1 control=part
 
-sqlldr %USER%/%PASSWORD%@%DB% control=prt
+sqlldr %1 control=pcmrt
 
-sqlldr %USER%/%PASSWORD%@%DB% control=prtp
+sqlldr %1 control=prt
 
-sqlldr %USER%/%PASSWORD%@%DB% control=qurt
+sqlldr %1 control=prtp
 
-sqlldr %USER%/%PASSWORD%@%DB% control=qust
+sqlldr %1 control=qurt
 
-sqlldr %USER%/%PASSWORD%@%DB% control=rety
+sqlldr %1 control=qust
 
-sqlldr %USER%/%PASSWORD%@%DB% control=rvty
+sqlldr %1 control=rety
 
-sqlldr %USER%/%PASSWORD%@%DB% control=svcp
+sqlldr %1 control=rvty
 
-sqlldr %USER%/%PASSWORD%@%DB% control=slty
+sqlldr %1 control=svcp
+
+sqlldr %1 control=slty
+
+sqlldr %1 control=cnty
+
+sqlldr %1 control=cnor
+
+sqlldr %1 control=slva
+
+sqlldr %1 control=caca
+
+goto :done
+
+:usage
+
+echo usage 		InstallSeed user/password@database
+
+:done
\ No newline at end of file
diff --git a/Schema/alty.ctl b/Schema/alty.ctl
index e2a7b0c..90f3e0d 100644
--- a/Schema/alty.ctl
+++ b/Schema/alty.ctl
@@ -1,45 +1,45 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE asset_location_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-00,Unknown
-01,Cellar
-02,Under Stairs
-03,Hall
-04,Kitchen
-05,Bathroom
-06,Garage
-07,Canteen
-08,Cloakroom
-09,Cupboard
-10,Domestic Science
-11,Front Door
-12,Hall Cupboard
-13,Kitchen Cupboard
-14,Kitchen under sink
-15,Landing
-16,Office
-17,Office Cupboard
-18,Outside WC
-19,Pantry
-20,Porch
-21,Public Bar
-22,Rear of Shop
-23,Saloon Bar
-24,Shed
-25,Shop Front
-26,Shop Window
-27,Staff Room
-28,Store Room
-29,Toilet
-30,Under Counter
-31,Waiting Room
-32,Meter box Outside
-98,Other
-99,Outside
+00|Unknown
+01|Cellar
+02|Under Stairs
+03|Hall
+04|Kitchen
+05|Bathroom
+06|Garage
+07|Canteen
+08|Cloakroom
+09|Cupboard
+10|Domestic Science
+11|Front Door
+12|Hall Cupboard
+13|Kitchen Cupboard
+14|Kitchen under sink
+15|Landing
+16|Office
+17|Office Cupboard
+18|Outside WC
+19|Pantry
+20|Porch
+21|Public Bar
+22|Rear of Shop
+23|Saloon Bar
+24|Shed
+25|Shop Front
+26|Shop Window
+27|Staff Room
+28|Store Room
+29|Toilet
+30|Under Counter
+31|Waiting Room
+32|Meter box Outside
+98|Other
+99|Outside
diff --git a/Schema/caca.ctl b/Schema/caca.ctl
new file mode 100644
index 0000000..7faff56
--- /dev/null
+++ b/Schema/caca.ctl
@@ -0,0 +1,30 @@
+LOAD DATA
+INFILE *
+INTO TABLE care_categories
+REPLACE
+FIELDS TERMINATED BY '|'
+(
+code
+,description
+)
+BEGINDATA
+03|SEUC Unclassified
+04|Aged 60+
+05|Blind
+06|Braille User
+07|Poor Sight
+08|Deaf
+09|Poor Hearing
+10|Poor Speech
+11|Poor Sense of Smell
+12|Arthritic Hands
+13|Arthritic All
+14|Poor Walking
+15|Wheelchair
+16|Bedridden
+17|Mental Handicap
+18|Confused
+19|Serious Illness
+20|Other
+21|Heart Condition
+22|Breathing Difficulty
diff --git a/Schema/cnor.ctl b/Schema/cnor.ctl
new file mode 100644
index 0000000..56da8da
--- /dev/null
+++ b/Schema/cnor.ctl
@@ -0,0 +1,16 @@
+LOAD DATA
+INFILE *
+INTO TABLE connection_orientations
+REPLACE
+FIELDS TERMINATED BY '|'
+(
+description
+,id
+)
+BEGINDATA
+Vertical Up|1
+Vertical Down|3
+Horizontal Left|2
+Horizontal Right|4
+Horizontal Back|5
+Horizontal Front|6
diff --git a/Schema/cnty.ctl b/Schema/cnty.ctl
new file mode 100644
index 0000000..d7330d2
--- /dev/null
+++ b/Schema/cnty.ctl
@@ -0,0 +1,13 @@
+LOAD DATA
+INFILE *
+INTO TABLE connection_types
+REPLACE
+FIELDS TERMINATED BY '|'
+(
+description
+,code
+)
+BEGINDATA
+(mm) BSPT|MMBSTP
+(mm) PN16|MMPN16
+INCH BS 746|INCHBS
diff --git a/Schema/comt.ctl b/Schema/comt.ctl
index b2a88c3..5453b81 100644
--- a/Schema/comt.ctl
+++ b/Schema/comt.ctl
@@ -1,14 +1,14 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE contact_mechanism_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-FAX,Fax
-PHONE,Telephone
-MOBILE,Mobile
-EMAIL,Email
+FAX|Fax
+PHONE|Telephone
+MOBILE|Mobile
+EMAIL|Email
diff --git a/Schema/delete_tables.sql b/Schema/delete_tables.sql
index d44aa3d..a78a1fa 100644
--- a/Schema/delete_tables.sql
+++ b/Schema/delete_tables.sql
@@ -1,48 +1,47 @@
 delete from REGULATORS;
 delete from PARTY_ADDRESS_ROLES;
+delete from CONTACT_MECHANISMS;
+delete from QUOTE_STATUSES;
+delete from PARTY_CONTACT_MECHANISMS;
 delete from CARE_CATEGORIES;
 delete from RELIEF_VALVE_TYPES;
-delete from CONTACT_MECHANISMS;
-delete from PARTY_CONTACT_MECHANISMS;
-delete from REGIONS;
 delete from COSTS;
+delete from REGIONS;
 delete from CONNECTION_ORIENTATIONS;
 delete from CONTACT_MECHANISM_TYPES;
 delete from PARTY_CONTACT_MECHANISM_ROLES;
-delete from ENQUIRY_ROLE_TYPES;
 delete from FILTERS;
+delete from ENQUIRY_ROLE_TYPES;
 delete from QUOTE_ROLES;
 delete from PARTY_RELATIONSHIPS;
 delete from QUOTES;
-delete from PARTY_CONTACT_MECH_ROLE_TYPES;
 delete from QUOTE_EVENTS;
-delete from SERVICE_PRESSURES;
 delete from PARTY_ADDRESSES;
+delete from SERVICE_PRESSURES;
 delete from ENQUIRY_EVENTS;
 delete from PARTIES;
 delete from ENQUIRY_TYPES;
 delete from QUOTE_ROLE_TYPES;
 delete from QUOTE_ITEMS;
+delete from ROLE_TYPES;
 delete from ASSET_LOCATION_TYPES;
-delete from PARTY_ADDRESS_ROLE_TYPES;
+delete from METERS;
 delete from CONNECTION_TYPES;
-delete from PARTY_RELATIONSHIP_TYPES;
-delete from PARTY_ROLE_TYPES;
-delete from HOUSING_TYPES;
-delete from ENQUIRY_STATUS_TYPES;
 delete from ENQUIRY_ROLES;
 delete from SLAMSHUT_TYPES;
-delete from ENQUIRIES;
-delete from BASES;
 delete from SLAMSHUT_VALVES;
+delete from BASES;
+delete from ENQUIRY_STATUS_TYPES;
+delete from ENQUIRIES;
 delete from RELIEF_VALVES;
-delete from METER_TYPES;
+delete from HOUSING_TYPES;
+delete from PARTY_RELATIONSHIP_TYPES;
 delete from REGULATOR_TYPES;
-delete from HOUSINGS;
 delete from MODULES;
-delete from FILTER_TYPES;
+delete from METER_TYPES;
+delete from HOUSINGS;
 delete from ADDRESSES;
 delete from PARTY_ROLES;
 delete from DRAWINGS;
-delete from QUOTE_STATUSES;
-EXIT
+delete from FILTER_TYPES;
+EXIT
\ No newline at end of file
diff --git a/Schema/enrt.ctl b/Schema/enrt.ctl
index f11bffe..58d6a37 100644
--- a/Schema/enrt.ctl
+++ b/Schema/enrt.ctl
@@ -1,14 +1,14 @@
 LOAD DATA
 INFILE *
-REPLACE
-INTO TABLE enquiry_role_types
-FIELDS TERMINATED BY ","
+INTO TABLE role_types
+APPEND
+FIELDS TERMINATED BY '|'
 (
-code
-,DESCRIPTION
+rt_type
+,code
+,description
 )
 BEGINDATA
-FAX,Fax
-PHONE,Telephone
-MOBILE,Mobile
-EMAIL,Email
+ENRT|CREATOR|Created Enquiry
+ENRT|UPDATER|Updated Enquiry
+ENRT|RFQ|Request For Quotation
diff --git a/Schema/enst.ctl b/Schema/enst.ctl
index 344c9d0..598968e 100644
--- a/Schema/enst.ctl
+++ b/Schema/enst.ctl
@@ -1,13 +1,13 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE enquiry_status_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-INP,In Progress
-SUBMITTED,Submitted For Quotation
-QUOTED,Quoted For
+INP|In Progress
+SUBMITTED|Submitted For Quotation
+QUOTED|Quoted For
diff --git a/Schema/enty.ctl b/Schema/enty.ctl
index c84d706..3fd91d7 100644
--- a/Schema/enty.ctl
+++ b/Schema/enty.ctl
@@ -1,19 +1,19 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE enquiry_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-INSTALL,Installation of new non-Standard meter
-STD INSTALL,Installation of Standard meter
-OFMAT,Request for OFGEM Meter Accuracy Test (OFMAT)
-EXCHANGE,Exchange of meter
-REMOVE,Removal of non-Standard meter
-STD REMOVE,Removal of a Standard meter
-RELOCATE,Relocation of meters
-ADDON,Purchase of standard add-ons for an existing meter module
-OTHER,Other
\ No newline at end of file
+INSTALL|Installation of new non-Standard meter
+STD INSTALL|Installation of Standard meter
+OFMAT|Request for OFGEM Meter Accuracy Test (OFMAT)
+EXCHANGE|Exchange of meter
+REMOVE|Removal of non-Standard meter
+STD REMOVE|Removal of a Standard meter
+RELOCATE|Relocation of meters
+ADDON|Purchase of standard add-ons for an existing meter module
+OTHER|Other
diff --git a/Schema/fity.ctl b/Schema/fity.ctl
index 6a058a9..b8f03ce 100644
--- a/Schema/fity.ctl
+++ b/Schema/fity.ctl
@@ -1,16 +1,16 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE filter_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-LLS,Low Loss Strainer
-FIU,Fixed in Union
-YT,Y Type
-IL,InLine
-AP,Angle Pattern
-G,Gauze
\ No newline at end of file
+LLS|Low Loss Strainer
+FIU|Fixed in Union
+YT|Y Type
+IL|InLine
+AP|Angle Pattern
+G|Gauze
diff --git a/Schema/hoty.ctl b/Schema/hoty.ctl
index b3a9cf0..624026c 100644
--- a/Schema/hoty.ctl
+++ b/Schema/hoty.ctl
@@ -1,13 +1,13 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE housing_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-LO,Lift Off
-WI,Walk In
-WT,Walk Through
\ No newline at end of file
+LO|Lift Off
+WI|Walk In
+WT|Walk Through
diff --git a/Schema/mety.ctl b/Schema/mety.ctl
index 91e187e..e231a5d 100644
--- a/Schema/mety.ctl
+++ b/Schema/mety.ctl
@@ -1,15 +1,15 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE meter_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
 code
-,DESCRIPTION
+,description
 )
 BEGINDATA
-ROTA,Rotary
-TURB,Turbine
-ORIF,Orifice
-ULTRA,Ultrasonic flow
-CORI,Coriolis
\ No newline at end of file
+ROTA|Rotary
+TURB|Turbine
+ORIF|Orifice
+ULTRA|Ultrasonic flow
+CORI|Coriolis
diff --git a/Schema/mip.con b/Schema/mip.con
index 0c7fa72..66f654f 100644
--- a/Schema/mip.con
+++ b/Schema/mip.con
@@ -1,21 +1,25 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
--- Generated for Oracle 10g on Fri Oct 19  16:55:39 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Nov 08  09:48:43 2007 by Server Generator 10.1.2.6.18
   
 PROMPT Creating Primary Key on 'REGULATORS'
 ALTER TABLE REGULATORS
  ADD (CONSTRAINT REGU_PK PRIMARY KEY 
-  (REGU_ID))
+  (ID))
 /
 
-PROMPT Creating Primary Key on 'PARTY_ADDRESS_ROLES'
-ALTER TABLE PARTY_ADDRESS_ROLES
- ADD (CONSTRAINT PAR_PK PRIMARY KEY 
+PROMPT Creating Primary Key on 'QUOTE_STATUSES'
+ALTER TABLE QUOTE_STATUSES
+ ADD (CONSTRAINT QUST_PK PRIMARY KEY 
+  (CODE))
+/
+
+PROMPT Creating Primary Key on 'PARTY_CONTACT_MECHANISMS'
+ALTER TABLE PARTY_CONTACT_MECHANISMS
+ ADD (CONSTRAINT PCM_PK PRIMARY KEY 
   (START_DATE
-  ,PADDR_START_DATE
-  ,PADDR_ADDR_CODE
-  ,PADDR_PRTY_ID
-  ,PART_CODE))
+  ,PRTY_ID
+  ,COME_ID))
 /
 
 PROMPT Creating Primary Key on 'CARE_CATEGORIES'
@@ -30,32 +34,16 @@ ALTER TABLE RELIEF_VALVE_TYPES
   (CODE))
 /
 
-PROMPT Creating Primary Key on 'QUOTE_STATUSES'
-ALTER TABLE QUOTE_STATUSES
- ADD (CONSTRAINT QUST_PK PRIMARY KEY 
-  (CODE))
-/
-
 PROMPT Creating Primary Key on 'CONTACT_MECHANISMS'
 ALTER TABLE CONTACT_MECHANISMS
  ADD (CONSTRAINT COME_PK PRIMARY KEY 
   (ID))
 /
 
-PROMPT Creating Primary Key on 'PARTY_CONTACT_MECHANISMS'
-ALTER TABLE PARTY_CONTACT_MECHANISMS
- ADD (CONSTRAINT PCM_PK PRIMARY KEY 
-  (START_DATE
-  ,PADDR_START_DATE
-  ,PADDR_ADDR_CODE
-  ,PADDR_PRTY_ID
-  ,PRTY_ID))
-/
-
-PROMPT Creating Primary Key on 'REGIONS'
-ALTER TABLE REGIONS
- ADD (CONSTRAINT REGI_PK PRIMARY KEY 
-  (CODE))
+PROMPT Creating Primary Key on 'PARTY_ADDRESS_ROLES'
+ALTER TABLE PARTY_ADDRESS_ROLES
+ ADD (CONSTRAINT PAR_PK PRIMARY KEY 
+  (START_DATE))
 /
 
 PROMPT Creating Primary Key on 'COSTS'
@@ -70,6 +58,12 @@ ALTER TABLE CONNECTION_ORIENTATIONS
   (ID))
 /
 
+PROMPT Creating Primary Key on 'REGIONS'
+ALTER TABLE REGIONS
+ ADD (CONSTRAINT REGI_PK PRIMARY KEY 
+  (CODE))
+/
+
 PROMPT Creating Primary Key on 'CONTACT_MECHANISM_TYPES'
 ALTER TABLE CONTACT_MECHANISM_TYPES
  ADD (CONSTRAINT COMT_PK PRIMARY KEY 
@@ -81,17 +75,9 @@ ALTER TABLE PARTY_CONTACT_MECHANISM_ROLES
  ADD (CONSTRAINT PCMR_PK PRIMARY KEY 
   (START_DATE
   ,PCM_START_DATE
-  ,PCM_PADDR_START_DATE
-  ,PCM_PADDR_ADDR_CODE
-  ,PCM_PADDR_PRTY_ID
   ,PCM_PRTY_ID
-  ,PCMRT_CODE))
-/
-
-PROMPT Creating Primary Key on 'ENQUIRY_ROLE_TYPES'
-ALTER TABLE ENQUIRY_ROLE_TYPES
- ADD (CONSTRAINT ENRT_PK PRIMARY KEY 
-  (CODE))
+  ,PCM_COME_ID
+  ,RT_CODE))
 /
 
 PROMPT Creating Primary Key on 'FILTERS'
@@ -105,45 +91,31 @@ ALTER TABLE QUOTE_ROLES
  ADD (CONSTRAINT QURO_PK PRIMARY KEY 
   (PRTY_ID
   ,QUTE_ID
-  ,QURT_CODE))
+  ,RT_CODE))
 /
 
 PROMPT Creating Primary Key on 'PARTY_RELATIONSHIPS'
 ALTER TABLE PARTY_RELATIONSHIPS
  ADD (CONSTRAINT PREL_PK PRIMARY KEY 
   (START_DATE
-  ,PARL_START_DATE_TO
-  ,PARL_PRT_CODE
-  ,PARL_PRTY_ID
-  ,PARL_START_DATE
-  ,PARL_PRT_CODE_FROM
-  ,PARL_PRTY_ID_FROM))
-/
-
-PROMPT Creating Primary Key on 'PARTY_ROLE_TYPES'
-ALTER TABLE PARTY_ROLE_TYPES
- ADD (CONSTRAINT PRT_PK PRIMARY KEY 
-  (CODE))
+  ,TO_PARL_ID
+  ,TO_PARL_PRTY_ID
+  ,TO_PARL_RT_CODE
+  ,FROM_PARL_ID
+  ,FROM_PARL_PRTY_ID
+  ,FROM_PARL_RT_CODE))
 /
 
 PROMPT Creating Primary Key on 'QUOTES'
 ALTER TABLE QUOTES
  ADD (CONSTRAINT QUTE_PK PRIMARY KEY 
-  (QUTE_ID))
-/
-
-PROMPT Creating Primary Key on 'PARTY_CONTACT_MECH_ROLE_TYPES'
-ALTER TABLE PARTY_CONTACT_MECH_ROLE_TYPES
- ADD (CONSTRAINT PCMRT_PK PRIMARY KEY 
-  (CODE))
+  (ID))
 /
 
 PROMPT Creating Primary Key on 'QUOTE_EVENTS'
 ALTER TABLE QUOTE_EVENTS
  ADD (CONSTRAINT QUEV_PK PRIMARY KEY 
-  (EVENT_DATE
-  ,QUST_CODE
-  ,QUTE_ID))
+  (EVENT_DATE))
 /
 
 PROMPT Creating Primary Key on 'SERVICE_PRESSURES'
@@ -164,8 +136,8 @@ PROMPT Creating Primary Key on 'ENQUIRY_EVENTS'
 ALTER TABLE ENQUIRY_EVENTS
  ADD (CONSTRAINT ENEV_PK PRIMARY KEY 
   (EVENT_DATE
-  ,ENQU_CODE
-  ,ENST_CODE))
+  ,ENST_CODE
+  ,ENQU_CODE))
 /
 
 PROMPT Creating Primary Key on 'PARTIES'
@@ -180,17 +152,16 @@ ALTER TABLE ENQUIRY_TYPES
   (CODE))
 /
 
-PROMPT Creating Primary Key on 'QUOTE_ROLE_TYPES'
-ALTER TABLE QUOTE_ROLE_TYPES
- ADD (CONSTRAINT QURT_PK PRIMARY KEY 
-  (CODE))
-/
-
 PROMPT Creating Primary Key on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS
  ADD (CONSTRAINT QUIT_PK PRIMARY KEY 
-  (ITEM_SEQUENCE
-  ,QUTE_ID))
+  (ITEM_SEQUENCE))
+/
+
+PROMPT Creating Primary Key on 'ROLE_TYPES'
+ALTER TABLE ROLE_TYPES
+ ADD (CONSTRAINT RT_PK PRIMARY KEY 
+  (CODE))
 /
 
 PROMPT Creating Primary Key on 'ASSET_LOCATION_TYPES'
@@ -199,12 +170,6 @@ ALTER TABLE ASSET_LOCATION_TYPES
   (CODE))
 /
 
-PROMPT Creating Primary Key on 'PARTY_ADDRESS_ROLE_TYPES'
-ALTER TABLE PARTY_ADDRESS_ROLE_TYPES
- ADD (CONSTRAINT PART_PK PRIMARY KEY 
-  (CODE))
-/
-
 PROMPT Creating Primary Key on 'METERS'
 ALTER TABLE METERS
  ADD (CONSTRAINT METR_PK PRIMARY KEY 
@@ -214,19 +179,6 @@ ALTER TABLE METERS
 PROMPT Creating Primary Key on 'CONNECTION_TYPES'
 ALTER TABLE CONNECTION_TYPES
  ADD (CONSTRAINT CNTY_PK PRIMARY KEY 
-  (ID))
-/
-
-PROMPT Creating Primary Key on 'PARTY_RELATIONSHIP_TYPES'
-ALTER TABLE PARTY_RELATIONSHIP_TYPES
- ADD (CONSTRAINT PRTP_PK PRIMARY KEY 
-  (TO_PRT_CODE
-  ,FROM_PRT_CODE))
-/
-
-PROMPT Creating Primary Key on 'HOUSING_TYPES'
-ALTER TABLE HOUSING_TYPES
- ADD (CONSTRAINT HOTY_PK PRIMARY KEY 
   (CODE))
 /
 
@@ -236,18 +188,24 @@ ALTER TABLE ENQUIRY_STATUS_TYPES
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'RELIEF_VALVES'
+ALTER TABLE RELIEF_VALVES
+ ADD (CONSTRAINT REVA_PK PRIMARY KEY 
+  (CODE))
+/
+
+PROMPT Creating Primary Key on 'SLAMSHUT_VALVES'
+ALTER TABLE SLAMSHUT_VALVES
+ ADD (CONSTRAINT SLVA_PK PRIMARY KEY 
+  (CODE))
+/
+
 PROMPT Creating Primary Key on 'ENQUIRY_ROLES'
 ALTER TABLE ENQUIRY_ROLES
  ADD (CONSTRAINT ENRO_PK PRIMARY KEY 
   (PRTY_ID
   ,ENQU_CODE
-  ,ENRT_CODE))
-/
-
-PROMPT Creating Primary Key on 'SLAMSHUT_TYPES'
-ALTER TABLE SLAMSHUT_TYPES
- ADD (CONSTRAINT SLTY_PK PRIMARY KEY 
-  (CODE))
+  ,RT_CODE))
 /
 
 PROMPT Creating Primary Key on 'ENQUIRIES'
@@ -262,48 +220,61 @@ ALTER TABLE BASES
   (CODE))
 /
 
-PROMPT Creating Primary Key on 'SLAMSHUT_VALVES'
-ALTER TABLE SLAMSHUT_VALVES
- ADD (CONSTRAINT SLVA_PK PRIMARY KEY 
+PROMPT Creating Primary Key on 'HOUSING_TYPES'
+ALTER TABLE HOUSING_TYPES
+ ADD (CONSTRAINT HOTY_PK PRIMARY KEY 
   (CODE))
 /
 
-PROMPT Creating Primary Key on 'RELIEF_VALVES'
-ALTER TABLE RELIEF_VALVES
- ADD (CONSTRAINT REVA_PK PRIMARY KEY 
+PROMPT Creating Primary Key on 'SLAMSHUT_TYPES'
+ALTER TABLE SLAMSHUT_TYPES
+ ADD (CONSTRAINT SLTY_PK PRIMARY KEY 
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'PARTY_RELATIONSHIP_TYPES'
+ALTER TABLE PARTY_RELATIONSHIP_TYPES
+ ADD (CONSTRAINT PRTP_PK PRIMARY KEY 
+  (TO_RT_CODE
+  ,FROM_RT_CODE))
+/
+
 PROMPT Creating Primary Key on 'METER_TYPES'
 ALTER TABLE METER_TYPES
  ADD (CONSTRAINT METY_PK PRIMARY KEY 
   (CODE))
 /
 
-PROMPT Creating Primary Key on 'REGULATOR_TYPES'
-ALTER TABLE REGULATOR_TYPES
- ADD (CONSTRAINT RETY_PK PRIMARY KEY 
-  (CODE))
-/
-
-PROMPT Creating Primary Key on 'HOUSINGS'
-ALTER TABLE HOUSINGS
- ADD (CONSTRAINT HOU_PK PRIMARY KEY 
-  (CODE))
-/
-
 PROMPT Creating Primary Key on 'MODULES'
 ALTER TABLE MODULES
  ADD (CONSTRAINT MODU_PK PRIMARY KEY 
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'HOUSINGS'
+ALTER TABLE HOUSINGS
+ ADD (CONSTRAINT HOU_PK PRIMARY KEY 
+  (CODE))
+/
+
+PROMPT Creating Primary Key on 'REGULATOR_TYPES'
+ALTER TABLE REGULATOR_TYPES
+ ADD (CONSTRAINT RETY_PK PRIMARY KEY 
+  (CODE))
+/
+
 PROMPT Creating Primary Key on 'FILTER_TYPES'
 ALTER TABLE FILTER_TYPES
  ADD (CONSTRAINT FITY_PK PRIMARY KEY 
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'DRAWINGS'
+ALTER TABLE DRAWINGS
+ ADD (CONSTRAINT DRWG_PK PRIMARY KEY 
+  (CODE))
+/
+
 PROMPT Creating Primary Key on 'ADDRESSES'
 ALTER TABLE ADDRESSES
  ADD (CONSTRAINT ADDR_PK PRIMARY KEY 
@@ -313,81 +284,87 @@ ALTER TABLE ADDRESSES
 PROMPT Creating Primary Key on 'PARTY_ROLES'
 ALTER TABLE PARTY_ROLES
  ADD (CONSTRAINT PARL_PK PRIMARY KEY 
-  (START_DATE
-  ,PRT_CODE
-  ,PRTY_ID))
-/
-
-PROMPT Creating Primary Key on 'DRAWINGS'
-ALTER TABLE DRAWINGS
- ADD (CONSTRAINT DRWG_PK PRIMARY KEY 
-  (CODE))
+  (ID
+  ,PRTY_ID
+  ,RT_CODE))
 /
 
 
-         
+        
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1192809339_COST__000 CHECK (COST_TYPE IN ('MECO', 'COST', 'MOCO', 'BACO', 'HOCO')))
+ ADD (CONSTRAINT AVCON_1194515322_COST__000 CHECK (COST_TYPE IN ('COST', 'BACO', 'HOCO', 'MECO', 'MOCO')))
 /
-         
+       
+PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
+ALTER TABLE PARTY_RELATIONSHIPS
+ ADD (CONSTRAINT PARL_PRTP_MISMATCH CHECK (from_parl_rt_code = from_prtp_rt_code
+and
+to_parl_rt_code = to_prtp_rt_code))
+/
+ 
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1192809339_QUTE__000 CHECK (QUTE_TYPE IN ('SQ', 'QUTE', 'AQ', 'MQ')))
+ ADD (CONSTRAINT AVCON_1194515322_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'SQ', 'AQ', 'MQ')))
 /
-      
+     
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1192809339_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1194515322_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1192809339_PRTY__000 CHECK (PRTY_TYPE 
-IN ('ORG', 'EO', 'IO', 'PERS', 'MKTP', 'NEMP', 'MANU', 'EMP', 'PRTY'
+ ADD (CONSTRAINT AVCON_1194515322_PRTY__000 CHECK (PRTY_TYPE 
+IN ('EMP', 'IO', 'PRTY', 'ORG', 'NEMP', 'PERS', 'MANU', 'EO', 'MKTP'
 )))
 /
-             
+   
+PROMPT Creating Check Constraint on 'ROLE_TYPES'
+ALTER TABLE ROLE_TYPES
+ ADD (CONSTRAINT AVCON_1194515322_RT_TY_000 CHECK (RT_TYPE IN ('PCMRT', 'PART', 'QURT', 'PRT', 'RT', 'ENRT')))
+/
+        
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_BYPAS_000 CHECK (BYPASS_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_BYPAS_000 CHECK (BYPASS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1192809339_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194515322_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /
-           
+            
 
 PROMPT Creating Foreign Key on 'REGULATORS'
 ALTER TABLE REGULATORS ADD (CONSTRAINT
@@ -396,42 +373,6 @@ ALTER TABLE REGULATORS ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'PARTY_ADDRESS_ROLES'
-ALTER TABLE PARTY_ADDRESS_ROLES ADD (CONSTRAINT
- PAR_PART_FK FOREIGN KEY 
-  (PART_CODE) REFERENCES PARTY_ADDRESS_ROLE_TYPES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'PARTY_ADDRESS_ROLES'
-ALTER TABLE PARTY_ADDRESS_ROLES ADD (CONSTRAINT
- PAR_PADDR_FK FOREIGN KEY 
-  (PADDR_START_DATE
-  ,PADDR_ADDR_CODE
-  ,PADDR_PRTY_ID) REFERENCES PARTY_ADDRESSES
-  (START_DATE
-  ,ADDR_CODE
-  ,PRTY_ID))
-/
-
-PROMPT Creating Foreign Key on 'CONTACT_MECHANISMS'
-ALTER TABLE CONTACT_MECHANISMS ADD (CONSTRAINT
- COME_COMT_FK FOREIGN KEY 
-  (COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'PARTY_CONTACT_MECHANISMS'
-ALTER TABLE PARTY_CONTACT_MECHANISMS ADD (CONSTRAINT
- PCM_PADDR_FK FOREIGN KEY 
-  (PADDR_START_DATE
-  ,PADDR_ADDR_CODE
-  ,PADDR_PRTY_ID) REFERENCES PARTY_ADDRESSES
-  (START_DATE
-  ,ADDR_CODE
-  ,PRTY_ID))
-/
-
 PROMPT Creating Foreign Key on 'PARTY_CONTACT_MECHANISMS'
 ALTER TABLE PARTY_CONTACT_MECHANISMS ADD (CONSTRAINT
  PCM_COME_FK FOREIGN KEY 
@@ -446,6 +387,42 @@ ALTER TABLE PARTY_CONTACT_MECHANISMS ADD (CONSTRAINT
   (ID))
 /
 
+PROMPT Creating Foreign Key on 'PARTY_CONTACT_MECHANISMS'
+ALTER TABLE PARTY_CONTACT_MECHANISMS ADD (CONSTRAINT
+ PCM_PADDR_FK FOREIGN KEY 
+  (PADDR_START_DATE
+  ,PADDR_ADDR_CODE
+  ,PADDR_PRTY_ID) REFERENCES PARTY_ADDRESSES
+  (START_DATE
+  ,ADDR_CODE
+  ,PRTY_ID))
+/
+
+PROMPT Creating Foreign Key on 'CONTACT_MECHANISMS'
+ALTER TABLE CONTACT_MECHANISMS ADD (CONSTRAINT
+ COME_COMT_FK FOREIGN KEY 
+  (COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'PARTY_ADDRESS_ROLES'
+ALTER TABLE PARTY_ADDRESS_ROLES ADD (CONSTRAINT
+ PAR_PADDR_FK FOREIGN KEY 
+  (PADDR_START_DATE
+  ,PADDR_ADDR_CODE
+  ,PADDR_PRTY_ID) REFERENCES PARTY_ADDRESSES
+  (START_DATE
+  ,ADDR_CODE
+  ,PRTY_ID))
+/
+
+PROMPT Creating Foreign Key on 'PARTY_ADDRESS_ROLES'
+ALTER TABLE PARTY_ADDRESS_ROLES ADD (CONSTRAINT
+ PAR_RT_FK FOREIGN KEY 
+  (RT_CODE) REFERENCES ROLE_TYPES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'COSTS'
 ALTER TABLE COSTS ADD (CONSTRAINT
  COST_HOU_FK FOREIGN KEY 
@@ -453,20 +430,6 @@ ALTER TABLE COSTS ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'COSTS'
-ALTER TABLE COSTS ADD (CONSTRAINT
- COST_MODU_FK FOREIGN KEY 
-  (MODU_CODE) REFERENCES MODULES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'COSTS'
-ALTER TABLE COSTS ADD (CONSTRAINT
- COST_BAS_FK FOREIGN KEY 
-  (BAS_CODE) REFERENCES BASES
-  (CODE))
-/
-
 PROMPT Creating Foreign Key on 'COSTS'
 ALTER TABLE COSTS ADD (CONSTRAINT
  COST_METR_FK FOREIGN KEY 
@@ -474,6 +437,13 @@ ALTER TABLE COSTS ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'COSTS'
+ALTER TABLE COSTS ADD (CONSTRAINT
+ COST_MODU_FK FOREIGN KEY 
+  (MODU_CODE) REFERENCES MODULES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'COSTS'
 ALTER TABLE COSTS ADD (CONSTRAINT
  COST_REGI_FK FOREIGN KEY 
@@ -481,10 +451,17 @@ ALTER TABLE COSTS ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'COSTS'
+ALTER TABLE COSTS ADD (CONSTRAINT
+ COST_BAS_FK FOREIGN KEY 
+  (BAS_CODE) REFERENCES BASES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'PARTY_CONTACT_MECHANISM_ROLES'
 ALTER TABLE PARTY_CONTACT_MECHANISM_ROLES ADD (CONSTRAINT
- PCMR_PCMRT_FK FOREIGN KEY 
-  (PCMRT_CODE) REFERENCES PARTY_CONTACT_MECH_ROLE_TYPES
+ PCMR_RT_FK FOREIGN KEY 
+  (RT_CODE) REFERENCES ROLE_TYPES
   (CODE))
 /
 
@@ -492,15 +469,11 @@ PROMPT Creating Foreign Key on 'PARTY_CONTACT_MECHANISM_ROLES'
 ALTER TABLE PARTY_CONTACT_MECHANISM_ROLES ADD (CONSTRAINT
  PCMR_PCM_FK FOREIGN KEY 
   (PCM_START_DATE
-  ,PCM_PADDR_START_DATE
-  ,PCM_PADDR_ADDR_CODE
-  ,PCM_PADDR_PRTY_ID
-  ,PCM_PRTY_ID) REFERENCES PARTY_CONTACT_MECHANISMS
+  ,PCM_PRTY_ID
+  ,PCM_COME_ID) REFERENCES PARTY_CONTACT_MECHANISMS
   (START_DATE
-  ,PADDR_START_DATE
-  ,PADDR_ADDR_CODE
-  ,PADDR_PRTY_ID
-  ,PRTY_ID))
+  ,PRTY_ID
+  ,COME_ID))
 /
 
 PROMPT Creating Foreign Key on 'FILTERS'
@@ -521,45 +494,45 @@ PROMPT Creating Foreign Key on 'QUOTE_ROLES'
 ALTER TABLE QUOTE_ROLES ADD (CONSTRAINT
  QURO_QUTE_FK FOREIGN KEY 
   (QUTE_ID) REFERENCES QUOTES
-  (QUTE_ID))
+  (ID))
 /
 
 PROMPT Creating Foreign Key on 'QUOTE_ROLES'
 ALTER TABLE QUOTE_ROLES ADD (CONSTRAINT
- QURO_QURT_FK FOREIGN KEY 
-  (QURT_CODE) REFERENCES QUOTE_ROLE_TYPES
+ QURO_RT_FK FOREIGN KEY 
+  (RT_CODE) REFERENCES ROLE_TYPES
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIPS'
-ALTER TABLE PARTY_RELATIONSHIPS ADD (CONSTRAINT
- PREL_PRTP_FK FOREIGN KEY 
-  (PRTP_PRT_CODE
-  ,PRTP_PRT_CODE_FROM) REFERENCES PARTY_RELATIONSHIP_TYPES
-  (TO_PRT_CODE
-  ,FROM_PRT_CODE))
-/
-
-PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIPS'
-ALTER TABLE PARTY_RELATIONSHIPS ADD (CONSTRAINT
- PREL_PARL_FK FOREIGN KEY 
-  (PARL_START_DATE
-  ,PARL_PRT_CODE_FROM
-  ,PARL_PRTY_ID_FROM) REFERENCES PARTY_ROLES
-  (START_DATE
-  ,PRT_CODE
-  ,PRTY_ID))
-/
-
 PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIPS'
 ALTER TABLE PARTY_RELATIONSHIPS ADD (CONSTRAINT
  PREL_PARL_TO_FK FOREIGN KEY 
-  (PARL_START_DATE_TO
-  ,PARL_PRT_CODE
-  ,PARL_PRTY_ID) REFERENCES PARTY_ROLES
-  (START_DATE
-  ,PRT_CODE
-  ,PRTY_ID))
+  (TO_PARL_ID
+  ,TO_PARL_PRTY_ID
+  ,TO_PARL_RT_CODE) REFERENCES PARTY_ROLES
+  (ID
+  ,PRTY_ID
+  ,RT_CODE))
+/
+
+PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIPS'
+ALTER TABLE PARTY_RELATIONSHIPS ADD (CONSTRAINT
+ PREL_PRTP_FK FOREIGN KEY 
+  (TO_PRTP_RT_CODE
+  ,FROM_PRTP_RT_CODE) REFERENCES PARTY_RELATIONSHIP_TYPES
+  (TO_RT_CODE
+  ,FROM_RT_CODE))
+/
+
+PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIPS'
+ALTER TABLE PARTY_RELATIONSHIPS ADD (CONSTRAINT
+ PREL_PARL_FROM_FK FOREIGN KEY 
+  (FROM_PARL_ID
+  ,FROM_PARL_PRTY_ID
+  ,FROM_PARL_RT_CODE) REFERENCES PARTY_ROLES
+  (ID
+  ,PRTY_ID
+  ,RT_CODE))
 /
 
 PROMPT Creating Foreign Key on 'QUOTES'
@@ -571,22 +544,15 @@ ALTER TABLE QUOTES ADD (CONSTRAINT
 
 PROMPT Creating Foreign Key on 'QUOTE_EVENTS'
 ALTER TABLE QUOTE_EVENTS ADD (CONSTRAINT
- QUEV_QUST_FK FOREIGN KEY 
-  (QUST_CODE) REFERENCES QUOTE_STATUSES
-  (CODE))
+ QUEV_QUTE_FK FOREIGN KEY 
+  (QUTE_ID) REFERENCES QUOTES
+  (ID))
 /
 
 PROMPT Creating Foreign Key on 'QUOTE_EVENTS'
 ALTER TABLE QUOTE_EVENTS ADD (CONSTRAINT
- QUEV_QUTE_FK FOREIGN KEY 
-  (QUTE_ID) REFERENCES QUOTES
-  (QUTE_ID))
-/
-
-PROMPT Creating Foreign Key on 'PARTY_ADDRESSES'
-ALTER TABLE PARTY_ADDRESSES ADD (CONSTRAINT
- PADDR_ADDR_FK FOREIGN KEY 
-  (ADDR_CODE) REFERENCES ADDRESSES
+ QUEV_QUST_FK FOREIGN KEY 
+  (QUST_CODE) REFERENCES QUOTE_STATUSES
   (CODE))
 /
 
@@ -597,10 +563,10 @@ ALTER TABLE PARTY_ADDRESSES ADD (CONSTRAINT
   (ID))
 /
 
-PROMPT Creating Foreign Key on 'ENQUIRY_EVENTS'
-ALTER TABLE ENQUIRY_EVENTS ADD (CONSTRAINT
- ENEV_ENST_FK FOREIGN KEY 
-  (ENST_CODE) REFERENCES ENQUIRY_STATUS_TYPES
+PROMPT Creating Foreign Key on 'PARTY_ADDRESSES'
+ALTER TABLE PARTY_ADDRESSES ADD (CONSTRAINT
+ PADDR_ADDR_FK FOREIGN KEY 
+  (ADDR_CODE) REFERENCES ADDRESSES
   (CODE))
 /
 
@@ -611,6 +577,13 @@ ALTER TABLE ENQUIRY_EVENTS ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'ENQUIRY_EVENTS'
+ALTER TABLE ENQUIRY_EVENTS ADD (CONSTRAINT
+ ENEV_ENST_FK FOREIGN KEY 
+  (ENST_CODE) REFERENCES ENQUIRY_STATUS_TYPES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
  QUIT_BAS_FK FOREIGN KEY 
@@ -636,7 +609,7 @@ PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
  QUIT_QUTE_FK FOREIGN KEY 
   (QUTE_ID) REFERENCES QUOTES
-  (QUTE_ID))
+  (ID))
 /
 
 PROMPT Creating Foreign Key on 'METERS'
@@ -646,13 +619,6 @@ ALTER TABLE METERS ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'METERS'
-ALTER TABLE METERS ADD (CONSTRAINT
- METR_PRTY_FK FOREIGN KEY 
-  (PRTY_ID) REFERENCES PARTIES
-  (ID))
-/
-
 PROMPT Creating Foreign Key on 'METERS'
 ALTER TABLE METERS ADD (CONSTRAINT
  METR_METY_FK FOREIGN KEY 
@@ -660,24 +626,24 @@ ALTER TABLE METERS ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIP_TYPES'
-ALTER TABLE PARTY_RELATIONSHIP_TYPES ADD (CONSTRAINT
- PRTP_PRT_FK FOREIGN KEY 
-  (FROM_PRT_CODE) REFERENCES PARTY_ROLE_TYPES
+PROMPT Creating Foreign Key on 'METERS'
+ALTER TABLE METERS ADD (CONSTRAINT
+ METR_PRTY_FK FOREIGN KEY 
+  (PRTY_ID) REFERENCES PARTIES
+  (ID))
+/
+
+PROMPT Creating Foreign Key on 'RELIEF_VALVES'
+ALTER TABLE RELIEF_VALVES ADD (CONSTRAINT
+ REVA_RVTY_FK FOREIGN KEY 
+  (RVTY_CODE) REFERENCES RELIEF_VALVE_TYPES
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIP_TYPES'
-ALTER TABLE PARTY_RELATIONSHIP_TYPES ADD (CONSTRAINT
- PRTP_PRT_TO_FK FOREIGN KEY 
-  (TO_PRT_CODE) REFERENCES PARTY_ROLE_TYPES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'ENQUIRY_ROLES'
-ALTER TABLE ENQUIRY_ROLES ADD (CONSTRAINT
- ENRO_ENRT_FK FOREIGN KEY 
-  (ENRT_CODE) REFERENCES ENQUIRY_ROLE_TYPES
+PROMPT Creating Foreign Key on 'SLAMSHUT_VALVES'
+ALTER TABLE SLAMSHUT_VALVES ADD (CONSTRAINT
+ SLVA_SLTY_FK FOREIGN KEY 
+  (SLTY_CODE) REFERENCES SLAMSHUT_TYPES
   (CODE))
 /
 
@@ -695,6 +661,41 @@ ALTER TABLE ENQUIRY_ROLES ADD (CONSTRAINT
   (ID))
 /
 
+PROMPT Creating Foreign Key on 'ENQUIRY_ROLES'
+ALTER TABLE ENQUIRY_ROLES ADD (CONSTRAINT
+ ENRO_RT_FK FOREIGN KEY 
+  (RT_CODE) REFERENCES ROLE_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_COMT_CONSUMER_FK FOREIGN KEY 
+  (CONSUMER_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_ALTY_FK FOREIGN KEY 
+  (ALTY_CODE) REFERENCES ASSET_LOCATION_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_COMT_ALT_CONSUMER_FK FOREIGN KEY 
+  (ALT_CONSUMER_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_COMT_AGENT_FK FOREIGN KEY 
+  (AGENT_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES ADD (CONSTRAINT
  ENQU_CACA_FK FOREIGN KEY 
@@ -702,6 +703,13 @@ ALTER TABLE ENQUIRIES ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES ADD (CONSTRAINT
+ ENQU_SVCP_REQUIRED_FK FOREIGN KEY 
+  (REQUIRED_SVCP_CODE) REFERENCES SERVICE_PRESSURES
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES ADD (CONSTRAINT
  ENQU_ENTY_FK FOREIGN KEY 
@@ -711,36 +719,8 @@ ALTER TABLE ENQUIRIES ADD (CONSTRAINT
 
 PROMPT Creating Foreign Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ENQU_SVCP_FK FOREIGN KEY 
-  (EXISTING_METER_SVC_PRESSURE) REFERENCES SERVICE_PRESSURES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ENQU_REQUIRED_SERVICE_PRESS_FK FOREIGN KEY 
-  (SVCP_CODE) REFERENCES SERVICE_PRESSURES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- METHOD_OF_CONTACTING_CONSUM_FK FOREIGN KEY 
-  (CONSUMER_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ENQU_COMT_FK FOREIGN KEY 
-  (AGENT_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ALTERNATIVE_METHOD_OF_CONTA_FK FOREIGN KEY 
-  (ALT_CONSUMER_COMT_CODE) REFERENCES CONTACT_MECHANISM_TYPES
+ ENQU_SVCP_EXISTING_FK FOREIGN KEY 
+  (EXISTING_SVCP_CODE) REFERENCES SERVICE_PRESSURES
   (CODE))
 /
 
@@ -751,13 +731,6 @@ ALTER TABLE ENQUIRIES ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES ADD (CONSTRAINT
- ENQU_ALTY_FK FOREIGN KEY 
-  (ALTY_CODE) REFERENCES ASSET_LOCATION_TYPES
-  (CODE))
-/
-
 PROMPT Creating Foreign Key on 'BASES'
 ALTER TABLE BASES ADD (CONSTRAINT
  BAS_DRWG_FK FOREIGN KEY 
@@ -765,76 +738,20 @@ ALTER TABLE BASES ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'SLAMSHUT_VALVES'
-ALTER TABLE SLAMSHUT_VALVES ADD (CONSTRAINT
- SLVA_SLTY_FK FOREIGN KEY 
-  (SLTY_CODE) REFERENCES SLAMSHUT_TYPES
+PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIP_TYPES'
+ALTER TABLE PARTY_RELATIONSHIP_TYPES ADD (CONSTRAINT
+ PRTP_RT_FROM_FK FOREIGN KEY 
+  (FROM_RT_CODE) REFERENCES ROLE_TYPES
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'RELIEF_VALVES'
-ALTER TABLE RELIEF_VALVES ADD (CONSTRAINT
- REVA_RVTY_FK FOREIGN KEY 
-  (RVTY_CODE) REFERENCES RELIEF_VALVE_TYPES
+PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIP_TYPES'
+ALTER TABLE PARTY_RELATIONSHIP_TYPES ADD (CONSTRAINT
+ PRTP_RT_FK FOREIGN KEY 
+  (TO_RT_CODE) REFERENCES ROLE_TYPES
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'HOUSINGS'
-ALTER TABLE HOUSINGS ADD (CONSTRAINT
- HOU_DRWG_FK FOREIGN KEY 
-  (DRWG_CODE) REFERENCES DRAWINGS
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'HOUSINGS'
-ALTER TABLE HOUSINGS ADD (CONSTRAINT
- HOU_HOTY_FK FOREIGN KEY 
-  (HOTY_CODE) REFERENCES HOUSING_TYPES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'HOUSINGS'
-ALTER TABLE HOUSINGS ADD (CONSTRAINT
- HOU_PRTY_FK FOREIGN KEY 
-  (PRTY_ID) REFERENCES PARTIES
-  (ID))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_FLTR_FK FOREIGN KEY 
-  (FLTR_ID) REFERENCES FILTERS
-  (ID))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_REVA_FK FOREIGN KEY 
-  (REVA_CODE) REFERENCES RELIEF_VALVES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_CNOR_OUTLET_ORIENTATIO_FK FOREIGN KEY 
-  (OUTLET_CNOR_ID) REFERENCES CONNECTION_ORIENTATIONS
-  (ID))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_SVCP_FK FOREIGN KEY 
-  (SVCP_CODE) REFERENCES SERVICE_PRESSURES
-  (CODE))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_CNTY_OUTLET_CONNECTION_FK FOREIGN KEY 
-  (OUTLET_CNTY_ID) REFERENCES CONNECTION_TYPES
-  (ID))
-/
-
 PROMPT Creating Foreign Key on 'MODULES'
 ALTER TABLE MODULES ADD (CONSTRAINT
  MODU_SLVA_FK FOREIGN KEY 
@@ -844,29 +761,29 @@ ALTER TABLE MODULES ADD (CONSTRAINT
 
 PROMPT Creating Foreign Key on 'MODULES'
 ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_HOU_FK FOREIGN KEY 
-  (HOU_CODE) REFERENCES HOUSINGS
+ MODU_FLTR_FK FOREIGN KEY 
+  (FLTR_ID) REFERENCES FILTERS
+  (ID))
+/
+
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_CNOR_OUTLET_FK FOREIGN KEY 
+  (OUTLET_CNOR_ID) REFERENCES CONNECTION_ORIENTATIONS
+  (ID))
+/
+
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_CNTY_INLET_FK FOREIGN KEY 
+  (INLET_CNTY_CODE) REFERENCES CONNECTION_TYPES
   (CODE))
 /
 
 PROMPT Creating Foreign Key on 'MODULES'
 ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_CNTY_FK FOREIGN KEY 
-  (INLET_CNTY_ID) REFERENCES CONNECTION_TYPES
-  (ID))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_CNOR_FK FOREIGN KEY 
-  (INLET_CNOR_ID) REFERENCES CONNECTION_ORIENTATIONS
-  (ID))
-/
-
-PROMPT Creating Foreign Key on 'MODULES'
-ALTER TABLE MODULES ADD (CONSTRAINT
- MODU_BAS_FK FOREIGN KEY 
-  (BAS_CODE) REFERENCES BASES
+ MODU_REVA_FK FOREIGN KEY 
+  (REVA_CODE) REFERENCES RELIEF_VALVES
   (CODE))
 /
 
@@ -884,17 +801,73 @@ ALTER TABLE MODULES ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_CNTY_OUTLET_FK FOREIGN KEY 
+  (OUTLET_CNTY_CODE) REFERENCES CONNECTION_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_SVCP_FK FOREIGN KEY 
+  (SVCP_CODE) REFERENCES SERVICE_PRESSURES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_CNOR_INLET_FK FOREIGN KEY 
+  (INLET_CNOR_ID) REFERENCES CONNECTION_ORIENTATIONS
+  (ID))
+/
+
 PROMPT Creating Foreign Key on 'MODULES'
 ALTER TABLE MODULES ADD (CONSTRAINT
  MODU_REGU_FK FOREIGN KEY 
   (REGU_ID) REFERENCES REGULATORS
-  (REGU_ID))
+  (ID))
+/
+
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_BAS_FK FOREIGN KEY 
+  (BAS_CODE) REFERENCES BASES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'MODULES'
+ALTER TABLE MODULES ADD (CONSTRAINT
+ MODU_HOU_FK FOREIGN KEY 
+  (HOU_CODE) REFERENCES HOUSINGS
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'HOUSINGS'
+ALTER TABLE HOUSINGS ADD (CONSTRAINT
+ HOU_HOTY_FK FOREIGN KEY 
+  (HOTY_CODE) REFERENCES HOUSING_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'HOUSINGS'
+ALTER TABLE HOUSINGS ADD (CONSTRAINT
+ HOU_PRTY_FK FOREIGN KEY 
+  (PRTY_ID) REFERENCES PARTIES
+  (ID))
+/
+
+PROMPT Creating Foreign Key on 'HOUSINGS'
+ALTER TABLE HOUSINGS ADD (CONSTRAINT
+ HOU_DRWG_FK FOREIGN KEY 
+  (DRWG_CODE) REFERENCES DRAWINGS
+  (CODE))
 /
 
 PROMPT Creating Foreign Key on 'PARTY_ROLES'
 ALTER TABLE PARTY_ROLES ADD (CONSTRAINT
- PARL_PRT_FK FOREIGN KEY 
-  (PRT_CODE) REFERENCES PARTY_ROLE_TYPES
+ PARL_RT_FK FOREIGN KEY 
+  (RT_CODE) REFERENCES ROLE_TYPES
   (CODE))
 /
 
diff --git a/Schema/mip.ind b/Schema/mip.ind
index 98e2d19..c7e2b98 100644
--- a/Schema/mip.ind
+++ b/Schema/mip.ind
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.ind
 --
--- Generated for Oracle 10g on Fri Oct 19  16:55:39 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Nov 08  09:48:43 2007 by Server Generator 10.1.2.6.18
   
 
 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -8,23 +8,6 @@ CREATE INDEX REGU_RETY_FK_I ON REGULATORS
  (RETY_CODE)
 /
 
-PROMPT Creating Index 'PAR_PART_FK_I'
-CREATE INDEX PAR_PART_FK_I ON PARTY_ADDRESS_ROLES
- (PART_CODE)
-/
-
-PROMPT Creating Index 'PAR_PADDR_FK_I'
-CREATE INDEX PAR_PADDR_FK_I ON PARTY_ADDRESS_ROLES
- (PADDR_START_DATE
- ,PADDR_PRTY_ID
- ,PADDR_ADDR_CODE)
-/
-
-PROMPT Creating Index 'COME_COMT_FK_I'
-CREATE INDEX COME_COMT_FK_I ON CONTACT_MECHANISMS
- (COMT_CODE)
-/
-
 PROMPT Creating Index 'PCM_COME_FK_I'
 CREATE INDEX PCM_COME_FK_I ON PARTY_CONTACT_MECHANISMS
  (COME_ID)
@@ -42,16 +25,33 @@ CREATE INDEX PCM_PADDR_FK_I ON PARTY_CONTACT_MECHANISMS
  ,PADDR_PRTY_ID)
 /
 
+PROMPT Creating Index 'COME_COMT_FK_I'
+CREATE INDEX COME_COMT_FK_I ON CONTACT_MECHANISMS
+ (COMT_CODE)
+/
+
+PROMPT Creating Index 'PAR_PADDR_FK_I'
+CREATE INDEX PAR_PADDR_FK_I ON PARTY_ADDRESS_ROLES
+ (PADDR_PRTY_ID
+ ,PADDR_START_DATE
+ ,PADDR_ADDR_CODE)
+/
+
+PROMPT Creating Index 'PAR_RT_FK_I'
+CREATE INDEX PAR_RT_FK_I ON PARTY_ADDRESS_ROLES
+ (RT_CODE)
+/
+
+PROMPT Creating Index 'COST_BAS_FK_I'
+CREATE INDEX COST_BAS_FK_I ON COSTS
+ (BAS_CODE)
+/
+
 PROMPT Creating Index 'COST_REGI_FK_I'
 CREATE INDEX COST_REGI_FK_I ON COSTS
  (REGI_CODE)
 /
 
-PROMPT Creating Index 'COST_HOU_FK_I'
-CREATE INDEX COST_HOU_FK_I ON COSTS
- (HOU_CODE)
-/
-
 PROMPT Creating Index 'COST_MODU_FK_I'
 CREATE INDEX COST_MODU_FK_I ON COSTS
  (MODU_CODE)
@@ -62,23 +62,21 @@ CREATE INDEX COST_METR_FK_I ON COSTS
  (METR_CODE)
 /
 
-PROMPT Creating Index 'COST_BAS_FK_I'
-CREATE INDEX COST_BAS_FK_I ON COSTS
- (BAS_CODE)
+PROMPT Creating Index 'COST_HOU_FK_I'
+CREATE INDEX COST_HOU_FK_I ON COSTS
+ (HOU_CODE)
 /
 
 PROMPT Creating Index 'PCMR_PCM_FK_I'
 CREATE INDEX PCMR_PCM_FK_I ON PARTY_CONTACT_MECHANISM_ROLES
- (PCM_PRTY_ID
- ,PCM_START_DATE
- ,PCM_PADDR_ADDR_CODE
- ,PCM_PADDR_START_DATE
- ,PCM_PADDR_PRTY_ID)
+ (PCM_START_DATE
+ ,PCM_COME_ID
+ ,PCM_PRTY_ID)
 /
 
-PROMPT Creating Index 'PCMR_PCMRT_FK_I'
-CREATE INDEX PCMR_PCMRT_FK_I ON PARTY_CONTACT_MECHANISM_ROLES
- (PCMRT_CODE)
+PROMPT Creating Index 'PCMR_RT_FK_I'
+CREATE INDEX PCMR_RT_FK_I ON PARTY_CONTACT_MECHANISM_ROLES
+ (RT_CODE)
 /
 
 PROMPT Creating Index 'FLTR_FITY_FK_I'
@@ -86,39 +84,39 @@ CREATE INDEX FLTR_FITY_FK_I ON FILTERS
  (FITY_CODE)
 /
 
-PROMPT Creating Index 'QURO_QUTE_FK_I'
-CREATE INDEX QURO_QUTE_FK_I ON QUOTE_ROLES
- (QUTE_ID)
-/
-
 PROMPT Creating Index 'QURO_PRTY_FK_I'
 CREATE INDEX QURO_PRTY_FK_I ON QUOTE_ROLES
  (PRTY_ID)
 /
 
+PROMPT Creating Index 'QURO_QUTE_FK_I'
+CREATE INDEX QURO_QUTE_FK_I ON QUOTE_ROLES
+ (QUTE_ID)
+/
+
 PROMPT Creating Index 'QURO_QURT_FK_I'
 CREATE INDEX QURO_QURT_FK_I ON QUOTE_ROLES
- (QURT_CODE)
+ (RT_CODE)
 /
 
 PROMPT Creating Index 'PREL_PRTP_FK_I'
 CREATE INDEX PREL_PRTP_FK_I ON PARTY_RELATIONSHIPS
- (PRTP_PRT_CODE_FROM
- ,PRTP_PRT_CODE)
-/
-
-PROMPT Creating Index 'PREL_PARL_TO_FK_I'
-CREATE INDEX PREL_PARL_TO_FK_I ON PARTY_RELATIONSHIPS
- (PARL_PRT_CODE
- ,PARL_START_DATE_TO
- ,PARL_PRTY_ID)
+ (TO_PRTP_RT_CODE
+ ,FROM_PRTP_RT_CODE)
 /
 
 PROMPT Creating Index 'PREL_PARL_FK_I'
 CREATE INDEX PREL_PARL_FK_I ON PARTY_RELATIONSHIPS
- (PARL_PRT_CODE_FROM
- ,PARL_START_DATE
- ,PARL_PRTY_ID_FROM)
+ (FROM_PARL_ID
+ ,FROM_PARL_PRTY_ID
+ ,FROM_PARL_RT_CODE)
+/
+
+PROMPT Creating Index 'PREL_PARL_TO_FK_I'
+CREATE INDEX PREL_PARL_TO_FK_I ON PARTY_RELATIONSHIPS
+ (TO_PARL_ID
+ ,TO_PARL_PRTY_ID
+ ,TO_PARL_RT_CODE)
 /
 
 PROMPT Creating Index 'QUTE_ENQU_FK_I'
@@ -136,19 +134,14 @@ CREATE INDEX QUEV_QUTE_FK_I ON QUOTE_EVENTS
  (QUTE_ID)
 /
 
-PROMPT Creating Index 'PADDR_PRTY_FK_I'
-CREATE INDEX PADDR_PRTY_FK_I ON PARTY_ADDRESSES
- (PRTY_ID)
-/
-
 PROMPT Creating Index 'PADDR_ADDR_FK_I'
 CREATE INDEX PADDR_ADDR_FK_I ON PARTY_ADDRESSES
  (ADDR_CODE)
 /
 
-PROMPT Creating Index 'ENEV_ENQU_FK_I'
-CREATE INDEX ENEV_ENQU_FK_I ON ENQUIRY_EVENTS
- (ENQU_CODE)
+PROMPT Creating Index 'PADDR_PRTY_FK_I'
+CREATE INDEX PADDR_PRTY_FK_I ON PARTY_ADDRESSES
+ (PRTY_ID)
 /
 
 PROMPT Creating Index 'ENEV_ENST_FK_I'
@@ -156,14 +149,9 @@ CREATE INDEX ENEV_ENST_FK_I ON ENQUIRY_EVENTS
  (ENST_CODE)
 /
 
-PROMPT Creating Index 'QUIT_MODU_FK_I'
-CREATE INDEX QUIT_MODU_FK_I ON QUOTE_ITEMS
- (MODU_CODE)
-/
-
-PROMPT Creating Index 'QUIT_HOU_FK_I'
-CREATE INDEX QUIT_HOU_FK_I ON QUOTE_ITEMS
- (HOU_CODE)
+PROMPT Creating Index 'ENEV_ENQU_FK_I'
+CREATE INDEX ENEV_ENQU_FK_I ON ENQUIRY_EVENTS
+ (ENQU_CODE)
 /
 
 PROMPT Creating Index 'QUIT_QUTE_FK_I'
@@ -171,11 +159,21 @@ CREATE INDEX QUIT_QUTE_FK_I ON QUOTE_ITEMS
  (QUTE_ID)
 /
 
+PROMPT Creating Index 'QUIT_MODU_FK_I'
+CREATE INDEX QUIT_MODU_FK_I ON QUOTE_ITEMS
+ (MODU_CODE)
+/
+
 PROMPT Creating Index 'QUIT_BAS_FK_I'
 CREATE INDEX QUIT_BAS_FK_I ON QUOTE_ITEMS
  (BAS_CODE)
 /
 
+PROMPT Creating Index 'QUIT_HOU_FK_I'
+CREATE INDEX QUIT_HOU_FK_I ON QUOTE_ITEMS
+ (HOU_CODE)
+/
+
 PROMPT Creating Index 'METR_METY_FK_I'
 CREATE INDEX METR_METY_FK_I ON METERS
  (METY_CODE)
@@ -191,14 +189,19 @@ CREATE INDEX METR_PRTY_FK_I ON METERS
  (PRTY_ID)
 /
 
-PROMPT Creating Index 'PRTP_PRT_FK_I'
-CREATE INDEX PRTP_PRT_FK_I ON PARTY_RELATIONSHIP_TYPES
- (FROM_PRT_CODE)
+PROMPT Creating Index 'REVA_RVTY_FK_I'
+CREATE INDEX REVA_RVTY_FK_I ON RELIEF_VALVES
+ (RVTY_CODE)
 /
 
-PROMPT Creating Index 'PRTP_PRT_TO_FK_I'
-CREATE INDEX PRTP_PRT_TO_FK_I ON PARTY_RELATIONSHIP_TYPES
- (TO_PRT_CODE)
+PROMPT Creating Index 'SLVA_SLTY_FK_I'
+CREATE INDEX SLVA_SLTY_FK_I ON SLAMSHUT_VALVES
+ (SLTY_CODE)
+/
+
+PROMPT Creating Index 'ENRO_RT_FK_I'
+CREATE INDEX ENRO_RT_FK_I ON ENQUIRY_ROLES
+ (RT_CODE)
 /
 
 PROMPT Creating Index 'ENRO_PRTY_FK_I'
@@ -211,49 +214,29 @@ CREATE INDEX ENRO_ENQU_FK_I ON ENQUIRY_ROLES
  (ENQU_CODE)
 /
 
-PROMPT Creating Index 'ENRO_ENRT_FK_I_1'
-CREATE INDEX ENRO_ENRT_FK_I_1 ON ENQUIRY_ROLES
- (ENRT_CODE)
-/
-
-PROMPT Creating Index 'ENRO_ENRT_FK_I'
-CREATE INDEX ENRO_ENRT_FK_I ON ENQUIRY_ROLES
- (ENRT_CODE)
-/
-
-PROMPT Creating Index 'ENQU_CACA_FK_I'
-CREATE INDEX ENQU_CACA_FK_I ON ENQUIRIES
- (CACA_CODE)
-/
-
 PROMPT Creating Index 'ENQU_METY_FK_I'
 CREATE INDEX ENQU_METY_FK_I ON ENQUIRIES
  (METY_CODE)
 /
 
+PROMPT Creating Index 'ENQU_SVCP_FK_I'
+CREATE INDEX ENQU_SVCP_FK_I ON ENQUIRIES
+ (EXISTING_SVCP_CODE)
+/
+
+PROMPT Creating Index 'ENQU_COMT_CONSUMER_FK_I'
+CREATE INDEX ENQU_COMT_CONSUMER_FK_I ON ENQUIRIES
+ (CONSUMER_COMT_CODE)
+/
+
 PROMPT Creating Index 'ENQU_ENTY_FK_I'
 CREATE INDEX ENQU_ENTY_FK_I ON ENQUIRIES
  (ENTY_CODE)
 /
 
-PROMPT Creating Index 'ENQU_COMT_FK_I'
-CREATE INDEX ENQU_COMT_FK_I ON ENQUIRIES
- (AGENT_COMT_CODE)
-/
-
-PROMPT Creating Index 'ENQU_SVCP_FK_I'
-CREATE INDEX ENQU_SVCP_FK_I ON ENQUIRIES
- (EXISTING_METER_SVC_PRESSURE)
-/
-
-PROMPT Creating Index 'ALTERNATIVE_METHOD_OF_CONTA__I'
-CREATE INDEX ALTERNATIVE_METHOD_OF_CONTA__I ON ENQUIRIES
- (ALT_CONSUMER_COMT_CODE)
-/
-
-PROMPT Creating Index 'METHOD_OF_CONTACTING_CONSUM__I'
-CREATE INDEX METHOD_OF_CONTACTING_CONSUM__I ON ENQUIRIES
- (CONSUMER_COMT_CODE)
+PROMPT Creating Index 'ENQU_CACA_FK_I'
+CREATE INDEX ENQU_CACA_FK_I ON ENQUIRIES
+ (CACA_CODE)
 /
 
 PROMPT Creating Index 'ENQU_ALTY_FK_I'
@@ -261,9 +244,19 @@ CREATE INDEX ENQU_ALTY_FK_I ON ENQUIRIES
  (ALTY_CODE)
 /
 
-PROMPT Creating Index 'ENQU_REQUIRED_SERVICE_PRESS__I'
-CREATE INDEX ENQU_REQUIRED_SERVICE_PRESS__I ON ENQUIRIES
- (SVCP_CODE)
+PROMPT Creating Index 'ENQU_COMT_AGENT_FK_I'
+CREATE INDEX ENQU_COMT_AGENT_FK_I ON ENQUIRIES
+ (AGENT_COMT_CODE)
+/
+
+PROMPT Creating Index 'ENQU_COMT_FK_I'
+CREATE INDEX ENQU_COMT_FK_I ON ENQUIRIES
+ (ALT_CONSUMER_COMT_CODE)
+/
+
+PROMPT Creating Index 'ENQU_SVCP_REQUIRED_FK_I'
+CREATE INDEX ENQU_SVCP_REQUIRED_FK_I ON ENQUIRIES
+ (REQUIRED_SVCP_CODE)
 /
 
 PROMPT Creating Index 'BAS_DRWG_FK_I'
@@ -271,79 +264,14 @@ CREATE INDEX BAS_DRWG_FK_I ON BASES
  (DRWG_CODE)
 /
 
-PROMPT Creating Index 'SLVA_SLTY_FK_I'
-CREATE INDEX SLVA_SLTY_FK_I ON SLAMSHUT_VALVES
- (SLTY_CODE)
+PROMPT Creating Index 'PRTP_RT_TO_FK_I'
+CREATE INDEX PRTP_RT_TO_FK_I ON PARTY_RELATIONSHIP_TYPES
+ (TO_RT_CODE)
 /
 
-PROMPT Creating Index 'REVA_RVTY_FK_I'
-CREATE INDEX REVA_RVTY_FK_I ON RELIEF_VALVES
- (RVTY_CODE)
-/
-
-PROMPT Creating Index 'HOU_HOTY_FK_I'
-CREATE INDEX HOU_HOTY_FK_I ON HOUSINGS
- (HOTY_CODE)
-/
-
-PROMPT Creating Index 'HOU_DRWG_FK_I'
-CREATE INDEX HOU_DRWG_FK_I ON HOUSINGS
- (DRWG_CODE)
-/
-
-PROMPT Creating Index 'HOU_PRTY_FK_I'
-CREATE INDEX HOU_PRTY_FK_I ON HOUSINGS
- (PRTY_ID)
-/
-
-PROMPT Creating Index 'MODU_SVCP_FK_I'
-CREATE INDEX MODU_SVCP_FK_I ON MODULES
- (SVCP_CODE)
-/
-
-PROMPT Creating Index 'MODU_CNOR_FK_I'
-CREATE INDEX MODU_CNOR_FK_I ON MODULES
- (INLET_CNOR_ID)
-/
-
-PROMPT Creating Index 'MODU_REGU_FK_I'
-CREATE INDEX MODU_REGU_FK_I ON MODULES
- (REGU_ID)
-/
-
-PROMPT Creating Index 'MODU_REVA_FK_I'
-CREATE INDEX MODU_REVA_FK_I ON MODULES
- (REVA_CODE)
-/
-
-PROMPT Creating Index 'MODU_METR_FK_I'
-CREATE INDEX MODU_METR_FK_I ON MODULES
- (METR_CODE)
-/
-
-PROMPT Creating Index 'MODU_SLVA_FK_I'
-CREATE INDEX MODU_SLVA_FK_I ON MODULES
- (SLVA_CODE)
-/
-
-PROMPT Creating Index 'MODU_FLTR_FK_I'
-CREATE INDEX MODU_FLTR_FK_I ON MODULES
- (FLTR_ID)
-/
-
-PROMPT Creating Index 'MODU_CNTY_FK_I'
-CREATE INDEX MODU_CNTY_FK_I ON MODULES
- (INLET_CNTY_ID)
-/
-
-PROMPT Creating Index 'MODU_DRWG_FK_I'
-CREATE INDEX MODU_DRWG_FK_I ON MODULES
- (DRWG_CODE)
-/
-
-PROMPT Creating Index 'MODU_HOU_FK_I'
-CREATE INDEX MODU_HOU_FK_I ON MODULES
- (HOU_CODE)
+PROMPT Creating Index 'PRTP_RT_FROM_FK_I'
+CREATE INDEX PRTP_RT_FROM_FK_I ON PARTY_RELATIONSHIP_TYPES
+ (FROM_RT_CODE)
 /
 
 PROMPT Creating Index 'MODU_CNOR_OUTLET_ORIENTATIO__I'
@@ -351,9 +279,9 @@ CREATE INDEX MODU_CNOR_OUTLET_ORIENTATIO__I ON MODULES
  (OUTLET_CNOR_ID)
 /
 
-PROMPT Creating Index 'MODU_CNTY_OUTLET_CONNECTION__I'
-CREATE INDEX MODU_CNTY_OUTLET_CONNECTION__I ON MODULES
- (OUTLET_CNTY_ID)
+PROMPT Creating Index 'MODU_METR_FK_I'
+CREATE INDEX MODU_METR_FK_I ON MODULES
+ (METR_CODE)
 /
 
 PROMPT Creating Index 'MODU_BAS_FK_I'
@@ -361,14 +289,79 @@ CREATE INDEX MODU_BAS_FK_I ON MODULES
  (BAS_CODE)
 /
 
+PROMPT Creating Index 'MODU_SVCP_FK_I'
+CREATE INDEX MODU_SVCP_FK_I ON MODULES
+ (SVCP_CODE)
+/
+
+PROMPT Creating Index 'MODU_CNTY_OUTLET_CONNECTION__I'
+CREATE INDEX MODU_CNTY_OUTLET_CONNECTION__I ON MODULES
+ (OUTLET_CNTY_CODE)
+/
+
+PROMPT Creating Index 'MODU_CNTY_FK_I'
+CREATE INDEX MODU_CNTY_FK_I ON MODULES
+ (INLET_CNTY_CODE)
+/
+
+PROMPT Creating Index 'MODU_DRWG_FK_I'
+CREATE INDEX MODU_DRWG_FK_I ON MODULES
+ (DRWG_CODE)
+/
+
+PROMPT Creating Index 'MODU_SLVA_FK_I'
+CREATE INDEX MODU_SLVA_FK_I ON MODULES
+ (SLVA_CODE)
+/
+
+PROMPT Creating Index 'MODU_REVA_FK_I'
+CREATE INDEX MODU_REVA_FK_I ON MODULES
+ (REVA_CODE)
+/
+
+PROMPT Creating Index 'MODU_REGU_FK_I'
+CREATE INDEX MODU_REGU_FK_I ON MODULES
+ (REGU_ID)
+/
+
+PROMPT Creating Index 'MODU_CNOR_FK_I'
+CREATE INDEX MODU_CNOR_FK_I ON MODULES
+ (INLET_CNOR_ID)
+/
+
+PROMPT Creating Index 'MODU_FLTR_FK_I'
+CREATE INDEX MODU_FLTR_FK_I ON MODULES
+ (FLTR_ID)
+/
+
+PROMPT Creating Index 'MODU_HOU_FK_I'
+CREATE INDEX MODU_HOU_FK_I ON MODULES
+ (HOU_CODE)
+/
+
+PROMPT Creating Index 'HOU_DRWG_FK_I'
+CREATE INDEX HOU_DRWG_FK_I ON HOUSINGS
+ (DRWG_CODE)
+/
+
+PROMPT Creating Index 'HOU_HOTY_FK_I'
+CREATE INDEX HOU_HOTY_FK_I ON HOUSINGS
+ (HOTY_CODE)
+/
+
+PROMPT Creating Index 'HOU_PRTY_FK_I'
+CREATE INDEX HOU_PRTY_FK_I ON HOUSINGS
+ (PRTY_ID)
+/
+
+PROMPT Creating Index 'PARL_RT_FK_I'
+CREATE INDEX PARL_RT_FK_I ON PARTY_ROLES
+ (RT_CODE)
+/
+
 PROMPT Creating Index 'PARL_PRTY_FK_I'
 CREATE INDEX PARL_PRTY_FK_I ON PARTY_ROLES
  (PRTY_ID)
 /
 
-PROMPT Creating Index 'PARL_PRT_FK_I'
-CREATE INDEX PARL_PRT_FK_I ON PARTY_ROLES
- (PRT_CODE)
-/
-
 
diff --git a/Schema/mip.sql b/Schema/mip.sql
index 0c78b63..a27c26c 100644
--- a/Schema/mip.sql
+++ b/Schema/mip.sql
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sql
 --
--- Generated for Oracle 10g on Fri Oct 19  16:55:39 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Nov 08  09:48:43 2007 by Server Generator 10.1.2.6.18
 
 
 SPOOL mip.lst
diff --git a/Schema/mip.sqs b/Schema/mip.sqs
index 87a0187..957217f 100644
--- a/Schema/mip.sqs
+++ b/Schema/mip.sqs
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sqs
 --
--- Generated for Oracle 10g on Fri Oct 19  16:55:39 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Nov 08  09:48:43 2007 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Sequence 'FLTR_SEQ'
 CREATE SEQUENCE FLTR_SEQ
@@ -30,13 +30,6 @@ CREATE SEQUENCE CNOR_SEQ
  NOCYCLE
 /
 
-PROMPT Creating Sequence 'CNTY_SEQ'
-CREATE SEQUENCE CNTY_SEQ
- NOMAXVALUE
- NOMINVALUE
- NOCYCLE
-/
-
 PROMPT Creating Sequence 'QUTE_SEQ'
 CREATE SEQUENCE QUTE_SEQ
  NOMAXVALUE
diff --git a/Schema/mip.tab b/Schema/mip.tab
index f4be818..97cc8fd 100644
--- a/Schema/mip.tab
+++ b/Schema/mip.tab
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.tab
 --
--- Generated for Oracle 10g on Fri Oct 19  16:55:39 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Nov 08  09:48:43 2007 by Server Generator 10.1.2.6.18
  
 
 
@@ -8,18 +8,27 @@ PROMPT Creating Table 'REGULATORS'
 CREATE TABLE REGULATORS
  (RETY_CODE VARCHAR2(80) NOT NULL
  ,LOCK_UP NUMBER NOT NULL
- ,REGU_ID NUMBER(*,0) NOT NULL
+ ,ID NUMBER(*,0) NOT NULL
  )
 /
 
-PROMPT Creating Table 'PARTY_ADDRESS_ROLES'
-CREATE TABLE PARTY_ADDRESS_ROLES
- (PADDR_ADDR_CODE VARCHAR2(80) NOT NULL
- ,PADDR_PRTY_ID NUMBER(*,0) NOT NULL
- ,PADDR_START_DATE DATE NOT NULL
- ,PART_CODE VARCHAR2(80) NOT NULL
+PROMPT Creating Table 'QUOTE_STATUSES'
+CREATE TABLE QUOTE_STATUSES
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
+PROMPT Creating Table 'PARTY_CONTACT_MECHANISMS'
+CREATE TABLE PARTY_CONTACT_MECHANISMS
+ (COME_ID NUMBER(*,0) NOT NULL
+ ,PRTY_ID NUMBER(*,0) NOT NULL
  ,START_DATE DATE NOT NULL
+ ,PADDR_ADDR_CODE VARCHAR2(80)
+ ,PADDR_PRTY_ID NUMBER(*,0)
+ ,PADDR_START_DATE DATE
  ,END_DATE DATE
+ ,COMMENTS VARCHAR2(255)
  )
 /
 
@@ -37,13 +46,6 @@ CREATE TABLE RELIEF_VALVE_TYPES
  )
 /
 
-PROMPT Creating Table 'QUOTE_STATUSES'
-CREATE TABLE QUOTE_STATUSES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(240)
- )
-/
-
 PROMPT Creating Table 'CONTACT_MECHANISMS'
 CREATE TABLE CONTACT_MECHANISMS
  (COMT_CODE VARCHAR2(80) NOT NULL
@@ -52,35 +54,26 @@ CREATE TABLE CONTACT_MECHANISMS
  )
 /
 
-PROMPT Creating Table 'PARTY_CONTACT_MECHANISMS'
-CREATE TABLE PARTY_CONTACT_MECHANISMS
- (PADDR_ADDR_CODE VARCHAR2(80) NOT NULL
+PROMPT Creating Table 'PARTY_ADDRESS_ROLES'
+CREATE TABLE PARTY_ADDRESS_ROLES
+ (START_DATE DATE NOT NULL
+ ,PADDR_ADDR_CODE VARCHAR2(80) NOT NULL
  ,PADDR_PRTY_ID NUMBER(*,0) NOT NULL
  ,PADDR_START_DATE DATE NOT NULL
- ,PRTY_ID NUMBER(*,0) NOT NULL
- ,START_DATE DATE NOT NULL
- ,COME_ID NUMBER(*,0)
+ ,RT_CODE VARCHAR2(80)
  ,END_DATE DATE
- ,COMMENTS VARCHAR2(255)
- )
-/
-
-PROMPT Creating Table 'REGIONS'
-CREATE TABLE REGIONS
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
  )
 /
 
 PROMPT Creating Table 'COSTS'
 CREATE TABLE COSTS
- (BAS_CODE VARCHAR2(80)
+ (COST_PRICE NUMBER(*,2)
+ ,VALID_FROM DATE NOT NULL
  ,REGI_CODE VARCHAR2(80)
- ,COST_PRICE NUMBER(*,2)
+ ,BAS_CODE VARCHAR2(80)
  ,SELLING_PRICE NUMBER(*,2) NOT NULL
  ,DELIVERY_COST NUMBER(*,2)
- ,VALID_FROM DATE NOT NULL
- ,VALID_TO DATE NOT NULL
+ ,VALID_TO DATE
  ,HOU_CODE VARCHAR2(80)
  ,METR_CODE VARCHAR2(80)
  ,MODU_CODE VARCHAR2(80)
@@ -96,33 +89,31 @@ CREATE TABLE CONNECTION_ORIENTATIONS
  )
 /
 
+PROMPT Creating Table 'REGIONS'
+CREATE TABLE REGIONS
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
 PROMPT Creating Table 'CONTACT_MECHANISM_TYPES'
 CREATE TABLE CONTACT_MECHANISM_TYPES
  (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(240) NOT NULL
+ ,DESCRIPTION VARCHAR2(80) NOT NULL
  )
 /
 
 PROMPT Creating Table 'PARTY_CONTACT_MECHANISM_ROLES'
 CREATE TABLE PARTY_CONTACT_MECHANISM_ROLES
- (PCMRT_CODE VARCHAR2(80) NOT NULL
- ,PCM_PADDR_ADDR_CODE VARCHAR2(80) NOT NULL
- ,PCM_PADDR_PRTY_ID NUMBER(*,0) NOT NULL
- ,PCM_PADDR_START_DATE DATE NOT NULL
+ (PCM_COME_ID NUMBER(*,0) NOT NULL
  ,PCM_PRTY_ID NUMBER(*,0) NOT NULL
  ,PCM_START_DATE DATE NOT NULL
+ ,RT_CODE VARCHAR2(80) NOT NULL
  ,START_DATE DATE NOT NULL
  ,END_DATE DATE
  )
 /
 
-PROMPT Creating Table 'ENQUIRY_ROLE_TYPES'
-CREATE TABLE ENQUIRY_ROLE_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'FILTERS'
 CREATE TABLE FILTERS
  (FITY_CODE VARCHAR2(80) NOT NULL
@@ -134,33 +125,29 @@ CREATE TABLE FILTERS
 PROMPT Creating Table 'QUOTE_ROLES'
 CREATE TABLE QUOTE_ROLES
  (PRTY_ID NUMBER(*,0) NOT NULL
- ,QURT_CODE VARCHAR2(80) NOT NULL
  ,QUTE_ID NUMBER(*,0) NOT NULL
+ ,RT_CODE VARCHAR2(80) NOT NULL
+ ,START_DATE DATE
+ ,END_DATE DATE
+ ,DESCRIPTION VARCHAR2(80)
  )
 /
 
 PROMPT Creating Table 'PARTY_RELATIONSHIPS'
 CREATE TABLE PARTY_RELATIONSHIPS
- (PARL_PRTY_ID NUMBER(*,0) NOT NULL
- ,PARL_PRTY_ID_FROM NUMBER(*,0) NOT NULL
- ,PARL_PRT_CODE VARCHAR2(240) NOT NULL
- ,PARL_PRT_CODE_FROM VARCHAR2(240) NOT NULL
- ,PARL_START_DATE DATE NOT NULL
- ,PARL_START_DATE_TO DATE NOT NULL
+ (FROM_PARL_ID NUMBER NOT NULL
+ ,TO_PARL_ID NUMBER NOT NULL
+ ,FROM_PARL_PRTY_ID NUMBER(*,0) NOT NULL
+ ,TO_PARL_PRTY_ID NUMBER(*,0) NOT NULL
+ ,FROM_PARL_RT_CODE VARCHAR2(80) NOT NULL
+ ,TO_PARL_RT_CODE VARCHAR2(80) NOT NULL
  ,START_DATE DATE NOT NULL
- ,PRTP_PRT_CODE VARCHAR2(240) NOT NULL
- ,PRTP_PRT_CODE_FROM VARCHAR2(240) NOT NULL
+ ,FROM_PRTP_RT_CODE VARCHAR2(80) NOT NULL
+ ,TO_PRTP_RT_CODE VARCHAR2(80) NOT NULL
  ,END_DATE DATE
  )
 /
 
-PROMPT Creating Table 'PARTY_ROLE_TYPES'
-CREATE TABLE PARTY_ROLE_TYPES
- (CODE VARCHAR2(240) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'QUOTES'
 CREATE TABLE QUOTES
  (ENQU_CODE VARCHAR2(80) NOT NULL
@@ -171,23 +158,16 @@ CREATE TABLE QUOTES
  ,CREATED_BY VARCHAR2(80) NOT NULL
  ,UPDATED_ON DATE
  ,UPDATED_BY VARCHAR2(80)
- ,QUTE_ID NUMBER(*,0) NOT NULL
+ ,ID NUMBER(*,0) NOT NULL
  ,QUTE_TYPE VARCHAR2(10) NOT NULL
  )
 /
 
-PROMPT Creating Table 'PARTY_CONTACT_MECH_ROLE_TYPES'
-CREATE TABLE PARTY_CONTACT_MECH_ROLE_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'QUOTE_EVENTS'
 CREATE TABLE QUOTE_EVENTS
- (QUST_CODE VARCHAR2(80) NOT NULL
+ (EVENT_DATE DATE NOT NULL
+ ,QUST_CODE VARCHAR2(80) NOT NULL
  ,QUTE_ID NUMBER(*,0) NOT NULL
- ,EVENT_DATE DATE NOT NULL
  )
 /
 
@@ -218,18 +198,18 @@ CREATE TABLE ENQUIRY_EVENTS
 
 PROMPT Creating Table 'PARTIES'
 CREATE TABLE PARTIES
- (CREATED_BY VARCHAR2(80) NOT NULL
- ,MANU_REF VARCHAR2(80)
- ,LT_7B_CONTRACT_REF VARCHAR2(25)
- ,NAME VARCHAR2(80)
- ,UPDATED_ON DATE
- ,MKPT_REF VARCHAR2(80)
- ,GT_7B_CONTRACT_REF VARCHAR2(25)
- ,CREATED_ON DATE NOT NULL
- ,DESCRIPTION VARCHAR2(80)
+ (MANU_REF VARCHAR2(80)
  ,SHORTCODE VARCHAR2(3)
- ,UPDATED_BY VARCHAR2(80)
+ ,CREATED_BY VARCHAR2(80) NOT NULL
+ ,NAME VARCHAR2(80)
+ ,DESCRIPTION VARCHAR2(80)
+ ,CREATED_ON DATE NOT NULL
  ,ADVERSARIAL_CONTRACT_REF VARCHAR2(25)
+ ,UPDATED_ON DATE
+ ,UPDATED_BY VARCHAR2(80)
+ ,MKTP_REF VARCHAR2(80)
+ ,LT_7B_CONTRACT_REF VARCHAR2(25)
+ ,GT_7B_CONTRACT_REF VARCHAR2(25)
  ,USERNAME VARCHAR2(80)
  ,PASSWORD_HASH VARCHAR2(255)
  ,STATUS VARCHAR2(6)
@@ -249,17 +229,10 @@ CREATE TABLE ENQUIRY_TYPES
  )
 /
 
-PROMPT Creating Table 'QUOTE_ROLE_TYPES'
-CREATE TABLE QUOTE_ROLE_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'QUOTE_ITEMS'
 CREATE TABLE QUOTE_ITEMS
- (QUTE_ID NUMBER(*,0) NOT NULL
- ,ITEM_SEQUENCE NUMBER NOT NULL
+ (ITEM_SEQUENCE NUMBER NOT NULL
+ ,QUTE_ID NUMBER(*,0) NOT NULL
  ,BAS_CODE VARCHAR2(80)
  ,HOU_CODE VARCHAR2(80)
  ,MODU_CODE VARCHAR2(80)
@@ -268,15 +241,16 @@ CREATE TABLE QUOTE_ITEMS
  )
 /
 
-PROMPT Creating Table 'ASSET_LOCATION_TYPES'
-CREATE TABLE ASSET_LOCATION_TYPES
+PROMPT Creating Table 'ROLE_TYPES'
+CREATE TABLE ROLE_TYPES
  (CODE VARCHAR2(80) NOT NULL
  ,DESCRIPTION VARCHAR2(80)
+ ,RT_TYPE VARCHAR2(10) NOT NULL
  )
 /
 
-PROMPT Creating Table 'PARTY_ADDRESS_ROLE_TYPES'
-CREATE TABLE PARTY_ADDRESS_ROLE_TYPES
+PROMPT Creating Table 'ASSET_LOCATION_TYPES'
+CREATE TABLE ASSET_LOCATION_TYPES
  (CODE VARCHAR2(80) NOT NULL
  ,DESCRIPTION VARCHAR2(80)
  )
@@ -298,28 +272,13 @@ CREATE TABLE METERS
  ,SKID NUMBER NOT NULL
  ,WEIGHT NUMBER NOT NULL
  ,Q_MAX NUMBER NOT NULL
- ,VALID_FROM DATE DEFAULT 'sysdate' NOT NULL
- ,VALID_T0 DATE
+ ,VALID_FROM DATE NOT NULL
+ ,VALID_TO DATE
  )
 /
 
 PROMPT Creating Table 'CONNECTION_TYPES'
 CREATE TABLE CONNECTION_TYPES
- (DESCRIPTION VARCHAR2(80)
- ,ID NUMBER(*,0) NOT NULL
- )
-/
-
-PROMPT Creating Table 'PARTY_RELATIONSHIP_TYPES'
-CREATE TABLE PARTY_RELATIONSHIP_TYPES
- (TO_PRT_CODE VARCHAR2(240) NOT NULL
- ,FROM_PRT_CODE VARCHAR2(240) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
-PROMPT Creating Table 'HOUSING_TYPES'
-CREATE TABLE HOUSING_TYPES
  (CODE VARCHAR2(80) NOT NULL
  ,DESCRIPTION VARCHAR2(80)
  )
@@ -332,17 +291,31 @@ CREATE TABLE ENQUIRY_STATUS_TYPES
  )
 /
 
-PROMPT Creating Table 'ENQUIRY_ROLES'
-CREATE TABLE ENQUIRY_ROLES
- (ENQU_CODE VARCHAR2(80) NOT NULL
- ,ENRT_CODE VARCHAR2(80) NOT NULL
- ,PRTY_ID NUMBER(*,0) NOT NULL
+PROMPT Creating Table 'RELIEF_VALVES'
+CREATE TABLE RELIEF_VALVES
+ (CODE VARCHAR2(80) NOT NULL
+ ,RVTY_CODE VARCHAR2(80) NOT NULL
+ ,RELIEF_VALVE_SIZE NUMBER
+ ,RELIEF_VALVE_SETTING NUMBER
  )
 /
 
-PROMPT Creating Table 'SLAMSHUT_TYPES'
-CREATE TABLE SLAMSHUT_TYPES
+PROMPT Creating Table 'SLAMSHUT_VALVES'
+CREATE TABLE SLAMSHUT_VALVES
  (CODE VARCHAR2(80) NOT NULL
+ ,SLTY_CODE VARCHAR2(80) NOT NULL
+ ,SLAMSHUT_SIZE NUMBER
+ ,SLAMSHUT_SETTING NUMBER NOT NULL
+ )
+/
+
+PROMPT Creating Table 'ENQUIRY_ROLES'
+CREATE TABLE ENQUIRY_ROLES
+ (ENQU_CODE VARCHAR2(80) NOT NULL
+ ,PRTY_ID NUMBER(*,0) NOT NULL
+ ,RT_CODE VARCHAR2(80) NOT NULL
+ ,START_DATE DATE
+ ,END_DATE DATE
  ,DESCRIPTION VARCHAR2(80)
  )
 /
@@ -350,56 +323,56 @@ CREATE TABLE SLAMSHUT_TYPES
 PROMPT Creating Table 'ENQUIRIES'
 CREATE TABLE ENQUIRIES
  (CODE VARCHAR2(80) NOT NULL
- ,AGENT_COMT_CODE VARCHAR2(80) NOT NULL
  ,ALTY_CODE VARCHAR2(80) NOT NULL
  ,CACA_CODE VARCHAR2(80) NOT NULL
  ,CONSUMER_COMT_CODE VARCHAR2(80) NOT NULL
  ,ENTY_CODE VARCHAR2(80) NOT NULL
- ,EXISTING_METER_SVC_PRESSURE VARCHAR2(80) NOT NULL
+ ,EXISTING_SVCP_CODE VARCHAR2(80) NOT NULL
+ ,AGENT_COMT_CODE VARCHAR2(80) NOT NULL
  ,METY_CODE VARCHAR2(80) NOT NULL
- ,SVCP_CODE VARCHAR2(80) NOT NULL
- ,CONSUMER_NAME VARCHAR2(80)
- ,INSTALL_BUILDING VARCHAR2(40) NOT NULL
- ,ALT_CONSUMER_COMT_CODE VARCHAR2(80)
+ ,REQUIRED_SVCP_CODE VARCHAR2(80) NOT NULL
  ,AGENT_CONTACT_VALUE VARCHAR2(240)
  ,TRANSACTION_REFERENCE VARCHAR2(80)
+ ,CONSUMER_NAME VARCHAR2(80)
  ,CONSUMER_CONTACT_VALUE VARCHAR2(240)
  ,INSTALL_SUB_BUILDING VARCHAR2(40)
+ ,INSTALL_BUILDING VARCHAR2(40) NOT NULL
  ,INSTALL_STREET VARCHAR2(60) NOT NULL
  ,INSTALL_CITY VARCHAR2(40) NOT NULL
  ,INSTALL_POSTCODE VARCHAR2(10) NOT NULL
+ ,ALT_BUILDING VARCHAR2(40)
+ ,ALT_POSTCODE VARCHAR2(10)
+ ,ASSET_LOCATION_NOTES VARCHAR2(100)
+ ,MPRN INTEGER
+ ,REQUIRED_METERING_PRESSURE NUMBER
+ ,OUTLET_PRESSURE NUMBER
+ ,HOUSING_REQUIRED VARCHAR2(240)
+ ,BASE_REQUIRED VARCHAR2(240)
+ ,BYPASS_REQUIRED VARCHAR2(240)
+ ,TWIN_STREAM_REQUIRED VARCHAR2(240)
+ ,QMAX NUMBER
+ ,EXISTING_METER_MODEL VARCHAR2(10)
+ ,OTHER_INFORMATION VARCHAR2(250)
+ ,CREATED_ON DATE NOT NULL
+ ,ALT_CONSUMER_COMT_CODE VARCHAR2(80)
  ,ALT_CONSUMER_NAME VARCHAR2(80)
  ,ALT_CONSUMER_CONTACT_VALUE VARCHAR2(240)
  ,ALT_SUB_BUILDING VARCHAR2(40)
- ,ALT_BUILDING VARCHAR2(40)
  ,ALT_STREET VARCHAR2(60)
  ,ALT_CITY VARCHAR2(40)
- ,ALT_POSTCODE VARCHAR2(10)
- ,ASSET_LOCATION_NOTES VARCHAR2(100)
  ,ACCESS_PASSWORD VARCHAR2(30)
  ,ACCESS_ADDITIONAL VARCHAR2(210)
- ,MPRN INTEGER
  ,MPRN_ALT VARCHAR2(250)
- ,REQUIRED_METERING_PRESSURE NUMBER
- ,OUTLET_PRESSURE NUMBER
  ,ANNUAL_QUANTITY NUMBER
  ,DOWNSTREAM_BOOSTER_OR_COMPRESS VARCHAR2(240)
  ,INDICATIVE_DATE DATE
  ,OTHER_PROJECT_REFERENCE VARCHAR2(50)
- ,HOUSING_REQUIRED VARCHAR2(240)
- ,BASE_REQUIRED VARCHAR2(240)
  ,CONVERTOR_REQUIRED VARCHAR2(240)
  ,AMR_REQUIRED VARCHAR2(240)
  ,EMS_REQUIRED VARCHAR2(240)
- ,BYPASS_REQUIRED VARCHAR2(240)
- ,TWIN_STREAM_REQUIRED VARCHAR2(240)
- ,QMAX NUMBER
  ,METER_SIZE VARCHAR2(240)
  ,EXISTING_METER_SERIAL_NO VARCHAR2(14)
- ,EXISTING_METER_MODEL VARCHAR2(10)
- ,OTHER_INFORMATION VARCHAR2(250)
  ,CREATED_BY NUMBER NOT NULL
- ,CREATED_ON DATE NOT NULL
  ,UPDATED_BY NUMBER
  ,UPDATED_ON DATE
  )
@@ -413,21 +386,25 @@ CREATE TABLE BASES
  )
 /
 
-PROMPT Creating Table 'SLAMSHUT_VALVES'
-CREATE TABLE SLAMSHUT_VALVES
+PROMPT Creating Table 'HOUSING_TYPES'
+CREATE TABLE HOUSING_TYPES
  (CODE VARCHAR2(80) NOT NULL
- ,SLTY_CODE VARCHAR2(80) NOT NULL
- ,SLAMSHUT_SIZE NUMBER
- ,SLAMSHUT_SETTING NUMBER NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
  )
 /
 
-PROMPT Creating Table 'RELIEF_VALVES'
-CREATE TABLE RELIEF_VALVES
+PROMPT Creating Table 'SLAMSHUT_TYPES'
+CREATE TABLE SLAMSHUT_TYPES
  (CODE VARCHAR2(80) NOT NULL
- ,RVTY_CODE VARCHAR2(80) NOT NULL
- ,RELIEF_VALVE_SIZE NUMBER
- ,RELIEF_VALVE_SETTING NUMBER
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
+PROMPT Creating Table 'PARTY_RELATIONSHIP_TYPES'
+CREATE TABLE PARTY_RELATIONSHIP_TYPES
+ (TO_RT_CODE VARCHAR2(80) NOT NULL
+ ,FROM_RT_CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
  )
 /
 
@@ -438,30 +415,13 @@ CREATE TABLE METER_TYPES
  )
 /
 
-PROMPT Creating Table 'REGULATOR_TYPES'
-CREATE TABLE REGULATOR_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
-PROMPT Creating Table 'HOUSINGS'
-CREATE TABLE HOUSINGS
- (CODE VARCHAR2(80) NOT NULL
- ,DRWG_CODE VARCHAR2(80) NOT NULL
- ,HOTY_CODE VARCHAR2(80) NOT NULL
- ,PRTY_ID NUMBER(*,0) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'MODULES'
 CREATE TABLE MODULES
  (CODE VARCHAR2(80) NOT NULL
- ,INLET_CNOR_ID NUMBER(*,0) NOT NULL
  ,OUTLET_CNOR_ID NUMBER(*,0) NOT NULL
- ,INLET_CNTY_ID NUMBER(*,0) NOT NULL
- ,OUTLET_CNTY_ID NUMBER(*,0) NOT NULL
+ ,INLET_CNOR_ID NUMBER(*,0) NOT NULL
+ ,OUTLET_CNTY_CODE VARCHAR2(80) NOT NULL
+ ,INLET_CNTY_CODE VARCHAR2(80) NOT NULL
  ,DRWG_CODE VARCHAR2(80) NOT NULL
  ,FLTR_ID NUMBER(*,0) NOT NULL
  ,METR_CODE VARCHAR2(80) NOT NULL
@@ -481,6 +441,23 @@ CREATE TABLE MODULES
  )
 /
 
+PROMPT Creating Table 'HOUSINGS'
+CREATE TABLE HOUSINGS
+ (CODE VARCHAR2(80) NOT NULL
+ ,DRWG_CODE VARCHAR2(80) NOT NULL
+ ,HOTY_CODE VARCHAR2(80) NOT NULL
+ ,PRTY_ID NUMBER(*,0) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
+PROMPT Creating Table 'REGULATOR_TYPES'
+CREATE TABLE REGULATOR_TYPES
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
 PROMPT Creating Table 'FILTER_TYPES'
 CREATE TABLE FILTER_TYPES
  (CODE VARCHAR2(80) NOT NULL
@@ -488,6 +465,12 @@ CREATE TABLE FILTER_TYPES
  )
 /
 
+PROMPT Creating Table 'DRAWINGS'
+CREATE TABLE DRAWINGS
+ (CODE VARCHAR2(80) NOT NULL
+ )
+/
+
 PROMPT Creating Table 'ADDRESSES'
 CREATE TABLE ADDRESSES
  (CODE VARCHAR2(80) NOT NULL
@@ -502,16 +485,11 @@ CREATE TABLE ADDRESSES
 PROMPT Creating Table 'PARTY_ROLES'
 CREATE TABLE PARTY_ROLES
  (PRTY_ID NUMBER(*,0) NOT NULL
- ,PRT_CODE VARCHAR2(240) NOT NULL
- ,START_DATE DATE NOT NULL
+ ,RT_CODE VARCHAR2(80) NOT NULL
+ ,ID NUMBER NOT NULL
+ ,START_DATE DATE
  ,END_DATE DATE
  ,DESCRIPTION VARCHAR2(80)
  )
 /
 
-PROMPT Creating Table 'DRAWINGS'
-CREATE TABLE DRAWINGS
- (CODE VARCHAR2(80) NOT NULL
- )
-/
-
diff --git a/Schema/part.ctl b/Schema/part.ctl
index f3ea6ef..d836f96 100644
--- a/Schema/part.ctl
+++ b/Schema/part.ctl
@@ -1,12 +1,13 @@
 LOAD DATA
 INFILE *
+INTO TABLE role_types
 REPLACE
-INTO TABLE party_address_role_types
-FIELDS TERMINATED BY ","
+FIELDS TERMINATED BY '|'
 (
-code
-,DESCRIPTION
+rt_type
+,code
+,description
 )
 BEGINDATA
-OFFICE,Office
-HOME,Home
+PART|OFFICE|Office
+PART|HOME|Home
diff --git a/Schema/pcmrt.ctl b/Schema/pcmrt.ctl
index d6b25b2..c1a26f0 100644
--- a/Schema/pcmrt.ctl
+++ b/Schema/pcmrt.ctl
@@ -1,22 +1,23 @@
 LOAD DATA
 INFILE *
-REPLACE
-INTO TABLE party_contact_mech_role_types
-FIELDS TERMINATED BY ","
+INTO TABLE role_types
+APPEND
+FIELDS TERMINATED BY '|'
 (
-code
-,DESCRIPTION
+rt_type
+,code
+,description
 )
 BEGINDATA
-BILLADDR,Billing inquiries
-BILLPHONE,Billing inquiries number
-MAINOFFADDR,Main office address
-MAINOFFPHONE,Main office number
-MAINOFFFAX,Main office fax
-SECOFFPHONE,Secondary office number
-SECOFFFAX,Secondary office fax
-MAINHOMEADDR,Main home address
-MAINHOMEPHONE,Main home number
-MAINHOMEFAX,Main home fax
-SECHOMEPHONE,Secondary home number
-SECHOMEFAX,Secondary home fax
\ No newline at end of file
+PCMRT|BILLADDR|Billing inquiries
+PCMRT|BILLPHONE|Billing inquiries number
+PCMRT|MAINOFFADDR|Main office address
+PCMRT|MAINOFFPHONE|Main office number
+PCMRT|MAINOFFFAX|Main office fax
+PCMRT|SECOFFPHONE|Secondary office number
+PCMRT|SECOFFFAX|Secondary office fax
+PCMRT|MAINHOMEADDR|Main home address
+PCMRT|MAINHOMEPHONE|Main home number
+PCMRT|MAINHOMEFAX|Main home fax
+PCMRT|SECHOMEPHONE|Secondary home number
+PCMRT|SECHOMEFAX|Secondary home fax
diff --git a/Schema/prt.ctl b/Schema/prt.ctl
index fad5dfc..4c748c4 100644
--- a/Schema/prt.ctl
+++ b/Schema/prt.ctl
@@ -1,19 +1,20 @@
 LOAD DATA
 INFILE *
-REPLACE
-INTO TABLE party_role_types
-FIELDS TERMINATED BY ","
+INTO TABLE role_types
+APPEND
+FIELDS TERMINATED BY '|'
 (
-code
-,DESCRIPTION
+rt_type
+,code
+,description
 )
 BEGINDATA
-AGENT,Agent
-SUPP,Service supplier
-SUPPADMIN,User administrator
-MIPADMIN,System Administrator
-ICU,Quotation operative
-CS,Customer Service operative
-INORG,Internal organization
-EXTORG,External organization
-MEMBER,Member of a group
+PRT|AGENT|Agent
+PRT|SUPP|Service supplier
+PRT|SUPPADMIN|User administrator
+PRT|MIPADMIN|System Administrator
+PRT|ICU|Quotation operative
+PRT|CS|Customer Service operative
+PRT|INORG|Internal organization
+PRT|EXTORG|External organization
+PRT|MEMBER|Member of a group
diff --git a/Schema/prtp.ctl b/Schema/prtp.ctl
index c85c937..7f4cfd9 100644
--- a/Schema/prtp.ctl
+++ b/Schema/prtp.ctl
@@ -1,19 +1,19 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE party_relationship_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
-from_prt_code
-,to_prt_code
-,DESCRIPTION
+to_rt_code
+,from_rt_code
+,description
 )
 BEGINDATA
-AGENT,SUPP,Agent for Service Supplier
-SUPPADMIN,SUPP,Administrator for Supplier
-SUPPADMIN,AGENT,Administrator of agent
-AGENT,SUPPADMIN,Administered by
-MEMBER,INORG,Member of internal organization
-MEMBER,EXTORG,Member of external organization
-ICU,INORG,Handles quotations for internal organization
-CS,INORG,Handles customer enquiries for internal organization
\ No newline at end of file
+SUPP|AGENT|Agent for Service Supplier
+SUPP|SUPPADMIN|Administrator for Supplier
+AGENT|SUPPADMIN|Administrator of agent
+SUPPADMIN|AGENT|Administered by
+INORG|MEMBER|Member of internal organization
+EXTORG|MEMBER|Member of external organization
+INORG|ICU|Handles quotations for internal organization
+INORG|CS|Handles customer enquiries for internal organization
diff --git a/Schema/qurt.ctl b/Schema/qurt.ctl
index a3c5538..f8e8b2c 100644
--- a/Schema/qurt.ctl
+++ b/Schema/qurt.ctl
@@ -1,16 +1,17 @@
 LOAD DATA
 INFILE *
-REPLACE
-INTO TABLE quote_role_types
-FIELDS TERMINATED BY ","
+INTO TABLE role_types
+APPEND
+FIELDS TERMINATED BY '|'
 (
-CODE
-,DESCRIPTION
+rt_type
+,code
+,description
 )
 BEGINDATA
-RFQ,Submitted request for quotation
-OWN,Owner of quotation
-ACC,Owner of accepted quotation
-REJ,Owner of rejected quotation
-SUBACC,Submitted acceptance of quotation
-SUBREJ,Submitted rejection of quotation
+QURT|Q RFQ|Submitted request for quotation
+QURT|Q OWN|Owner of quotation
+QURT|Q ACC|Owner of accepted quotation
+QURT|Q REJ|Owner of rejected quotation
+QURT|Q SUBACC|Submitted acceptance of quotation
+QURT|Q SUBREJ|Submitted rejection of quotation
diff --git a/Schema/rety.ctl b/Schema/rety.ctl
index 17857b9..6690b2b 100644
--- a/Schema/rety.ctl
+++ b/Schema/rety.ctl
@@ -1,22 +1,22 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE regulator_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
-CODE
-,DESCRIPTION
+code
+,description
 )
 BEGINDATA
-J90A,J90 Angled
-DF270R,Donkin Fig 270R
-DF280/309,Donkin Fig 280/309
-DF280,Donkin Fig 280
-RBI 2111,RBI 2111
-RBI 2011,RBI 2011
-RBI 2611,RBI 2611
-RBI 3211,RBI 3211
-RBE 1711,RBE 1711
-RBE 4011,RBE 4011
-SPERYN G1000,SPERYN G1000
-J48,J48
\ No newline at end of file
+J90A|J90 Angled
+DF270R|Donkin Fig 270R
+DF280/309|Donkin Fig 280/309
+DF280|Donkin Fig 280
+RBI 2111|RBI 2111
+RBI 2011|RBI 2011
+RBI 2611|RBI 2611
+RBI 3211|RBI 3211
+RBE 1711|RBE 1711
+RBE 4011|RBE 4011
+SPERYN G1000|SPERYN G1000
+J48|J48
diff --git a/Schema/rvty.ctl b/Schema/rvty.ctl
index e1461fb..5916474 100644
--- a/Schema/rvty.ctl
+++ b/Schema/rvty.ctl
@@ -1,13 +1,13 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE relief_valve_types
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
-CODE
-,DESCRIPTION
+code
+,description
 )
 BEGINDATA
-INTEGRAL,Integral
-10L,10L
-VS811,VS811
\ No newline at end of file
+INTEGRAL|Integral
+10L|10L
+VS811|VS811
diff --git a/Schema/slva.ctl b/Schema/slva.ctl
new file mode 100644
index 0000000..dabbbaf
--- /dev/null
+++ b/Schema/slva.ctl
@@ -0,0 +1,12 @@
+LOAD DATA
+INFILE *
+INTO TABLE slamshut_types
+REPLACE
+FIELDS TERMINATED BY '|'
+(
+code
+,description
+)
+BEGINDATA
+INTEGRAL|Integral
+DF305|Donkin Fig 305
diff --git a/Schema/svcp.ctl b/Schema/svcp.ctl
index e4c5018..0b816ad 100644
--- a/Schema/svcp.ctl
+++ b/Schema/svcp.ctl
@@ -1,17 +1,17 @@
 LOAD DATA
 INFILE *
-REPLACE
 INTO TABLE service_pressures
-FIELDS TERMINATED BY ","
+REPLACE
+FIELDS TERMINATED BY '|'
 (
-CODE
-,DESCRIPTION
+code
+,description
 )
 BEGINDATA
-LP,LP
-MP35,MP35
-MP65,MP65
-MP105,MP105
-MP180,MP180
-MP270,MP270
-IP,IP
\ No newline at end of file
+LP|LP
+MP35|MP35
+MP65|MP65
+MP105|MP105
+MP180|MP180
+MP270|MP270
+IP|IP