diff --git a/Schema/V_AICO.vw b/Schema/V_AICO.vw
index 10c22f0..f060ece 100644
--- a/Schema/V_AICO.vw
+++ b/Schema/V_AICO.vw
@@ -1,6 +1,6 @@
 CREATE OR REPLACE VIEW V_AICO AS
-SELECT aico_code
-      ,description
+SELECT id
+      ,adit_code
       ,selling_price
       ,cost_price
       ,delivery_cost
@@ -12,14 +12,14 @@ SELECT aico_code
             ,nvl(next_valid_from
                 ,to_date('2099'
                         ,'yyyy'))) AS effective_to
-  FROM (SELECT aico_code
-              ,description
+  FROM (SELECT id
+              ,adit_code
               ,selling_price
               ,cost_price
               ,delivery_cost
               ,regi_code
               ,valid_from
               ,valid_to
-              ,lead(valid_from) over(PARTITION BY cost.AICO_code, regi_code ORDER BY valid_from) AS next_valid_from
+              ,lead(valid_from) over(PARTITION BY cost.adit_code, regi_code ORDER BY valid_from) AS next_valid_from
           FROM costs cost
-         WHERE cost_type = 'AICO')
+         WHERE cost_type = 'AICO');
diff --git a/Schema/V_BACO.vw b/Schema/V_BACO.vw
index c154984..852ff8d 100644
--- a/Schema/V_BACO.vw
+++ b/Schema/V_BACO.vw
@@ -1,6 +1,5 @@
 CREATE OR REPLACE VIEW V_BACO AS
 SELECT bas_code
-      ,description
       ,selling_price
       ,cost_price
       ,delivery_cost
@@ -13,7 +12,6 @@ SELECT bas_code
                 ,to_date('2099'
                         ,'yyyy'))) AS effective_to
   FROM (SELECT bas_code
-              ,description
               ,selling_price
               ,cost_price
               ,delivery_cost
diff --git a/Schema/V_HOCO.vw b/Schema/V_HOCO.vw
index 6cdab91..8870368 100644
--- a/Schema/V_HOCO.vw
+++ b/Schema/V_HOCO.vw
@@ -1,6 +1,5 @@
 CREATE OR REPLACE VIEW V_HOCO AS
 SELECT hou_code
-      ,description
       ,selling_price
       ,cost_price
       ,delivery_cost
@@ -13,7 +12,6 @@ SELECT hou_code
                 ,to_date('2099'
                         ,'yyyy'))) AS effective_to
   FROM (SELECT hou_code
-              ,description
               ,selling_price
               ,cost_price
               ,delivery_cost
diff --git a/Schema/V_MECO.vw b/Schema/V_MECO.vw
index cae346e..72bd591 100644
--- a/Schema/V_MECO.vw
+++ b/Schema/V_MECO.vw
@@ -1,6 +1,5 @@
 CREATE OR REPLACE VIEW V_MECO AS
 SELECT metr_code
-      ,description
       ,selling_price
       ,cost_price
       ,delivery_cost
@@ -13,7 +12,6 @@ SELECT metr_code
                 ,to_date('2099'
                         ,'yyyy'))) AS effective_to
   FROM (SELECT metr_code
-              ,description
               ,selling_price
               ,cost_price
               ,delivery_cost
diff --git a/Schema/V_MOCO.vw b/Schema/V_MOCO.vw
index e9ec4f4..72164f4 100644
--- a/Schema/V_MOCO.vw
+++ b/Schema/V_MOCO.vw
@@ -1,6 +1,5 @@
 CREATE OR REPLACE VIEW V_MOCO AS
 SELECT modu_code
-      ,description
       ,selling_price
       ,cost_price
       ,delivery_cost
@@ -13,7 +12,6 @@ SELECT modu_code
                 ,to_date('2099'
                         ,'yyyy'))) AS effective_to
   FROM (SELECT modu_code
-              ,description
               ,selling_price
               ,cost_price
               ,delivery_cost
diff --git a/Schema/mip.con b/Schema/mip.con
index fc61de4..26fe507 100644
--- a/Schema/mip.con
+++ b/Schema/mip.con
@@ -1,11 +1,21 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
--- Generated for Oracle 10g on Fri Dec 14  15:06:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Dec 21  11:26:20 2007 by Server Generator 10.1.2.6.18
   
 PROMPT Creating Primary Key on 'SYSTEM_CONFIGURATION'
 ALTER TABLE SYSTEM_CONFIGURATION
  ADD (CONSTRAINT SYCO_PK PRIMARY KEY 
-  (PARAMETER))
+  (PARAMETER)
+ USING INDEX 
+ INITRANS 2
+ MAXTRANS 255
+ PCTFREE 10
+ STORAGE
+ (
+   INITIAL 65536
+   MINEXTENTS 1
+   MAXEXTENTS UNLIMITED
+ ))
 /
 
 PROMPT Creating Primary Key on 'REGULATORS'
@@ -71,10 +81,10 @@ ALTER TABLE PARTY_ADDRESS_ROLES
   ,RT_CODE))
 /
 
-PROMPT Creating Primary Key on 'METER_SIZE_CODES'
-ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT MESC_PK PRIMARY KEY 
-  (CODE))
+PROMPT Creating Primary Key on 'QUOTE_REASONING'
+ALTER TABLE QUOTE_REASONING
+ ADD (CONSTRAINT QURE_PK PRIMARY KEY 
+  (ID))
 /
 
 PROMPT Creating Primary Key on 'CONNECTION_ORIENTATIONS'
@@ -83,6 +93,12 @@ ALTER TABLE CONNECTION_ORIENTATIONS
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'METER_SIZE_CODES'
+ALTER TABLE METER_SIZE_CODES
+ ADD (CONSTRAINT MESC_PK PRIMARY KEY 
+  (CODE))
+/
+
 PROMPT Creating Primary Key on 'COSTS'
 ALTER TABLE COSTS
  ADD (CONSTRAINT COST_PK PRIMARY KEY 
@@ -249,7 +265,17 @@ ALTER TABLE CONNECTION_TYPES
 PROMPT Creating Primary Key on 'ERROR_LOGS'
 ALTER TABLE ERROR_LOGS
  ADD (CONSTRAINT ERLO_PK PRIMARY KEY 
-  (ERLO_ID))
+  (ERLO_ID)
+ USING INDEX 
+ INITRANS 2
+ MAXTRANS 255
+ PCTFREE 10
+ STORAGE
+ (
+   INITIAL 65536
+   MINEXTENTS 1
+   MAXEXTENTS UNLIMITED
+ ))
 /
 
 PROMPT Creating Primary Key on 'ENQUIRY_STATUS_TYPES'
@@ -279,12 +305,6 @@ ALTER TABLE ENQUIRY_ROLES
   ,START_DATE))
 /
 
-PROMPT Creating Primary Key on 'ENQUIRIES'
-ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT ENQU_PK PRIMARY KEY 
-  (ID))
-/
-
 PROMPT Creating Primary Key on 'BASES'
 ALTER TABLE BASES
  ADD (CONSTRAINT BAS_PK PRIMARY KEY 
@@ -303,6 +323,12 @@ ALTER TABLE SLAMSHUT_TYPES
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'ENQUIRIES'
+ALTER TABLE ENQUIRIES
+ ADD (CONSTRAINT ENQU_PK PRIMARY KEY 
+  (ID))
+/
+
 PROMPT Creating Primary Key on 'PARTY_RELATIONSHIP_TYPES'
 ALTER TABLE PARTY_RELATIONSHIP_TYPES
  ADD (CONSTRAINT PRTP_PK PRIMARY KEY 
@@ -310,12 +336,6 @@ ALTER TABLE PARTY_RELATIONSHIP_TYPES
   ,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 'APEX_AUTHORIZATION'
 ALTER TABLE APEX_AUTHORIZATION
  ADD (CONSTRAINT AUTH_PK PRIMARY KEY 
@@ -325,6 +345,12 @@ ALTER TABLE APEX_AUTHORIZATION
   ,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 'MODULES'
 ALTER TABLE MODULES
  ADD (CONSTRAINT MODU_PK PRIMARY KEY 
@@ -364,7 +390,23 @@ ALTER TABLE FILTER_TYPES
 PROMPT Creating Primary Key on 'EXCEPTION_MESSAGES'
 ALTER TABLE EXCEPTION_MESSAGES
  ADD (CONSTRAINT EXME_PK PRIMARY KEY 
-  (EXCEPTION_NUMBER))
+  (EXCEPTION_NUMBER)
+ USING INDEX 
+ INITRANS 2
+ MAXTRANS 255
+ PCTFREE 10
+ STORAGE
+ (
+   INITIAL 65536
+   MINEXTENTS 1
+   MAXEXTENTS UNLIMITED
+ ))
+/
+
+PROMPT Creating Primary Key on 'ADDITIONAL_ITEMS'
+ALTER TABLE ADDITIONAL_ITEMS
+ ADD (CONSTRAINT ADIT_PK PRIMARY KEY 
+  (CODE))
 /
 
 PROMPT Creating Primary Key on 'DRAWINGS'
@@ -411,26 +453,26 @@ ALTER TABLE REGI_ENQU_EXCLUSIONS
   ,COST_ID))
 /
 
-            
+              
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1197644793_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1197644793_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
-  
+ 
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1197644793_COST__000 CHECK (COST_TYPE 
-IN ('MOCO', 'BACO', 'HOCO', 'COST', 'MECO', 'AICO', 'LACO')))
+ ADD (CONSTRAINT AVCON_1198236379_COST__000 CHECK (COST_TYPE 
+IN ('LACO', 'BACO', 'MOCO', 'MECO', 'AICO', 'HOCO', 'COST')))
 /
    
 PROMPT Creating Check Constraint on 'DOCUMENTS'
 ALTER TABLE DOCUMENTS
- ADD (CONSTRAINT AVCON_1197644793_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
+ ADD (CONSTRAINT AVCON_1198236379_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
 /
     
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -442,22 +484,22 @@ to_parl_rt_code = to_prtp_rt_code))
  
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1197644793_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'AQ', 'SQ', 'MQ')))
+ ADD (CONSTRAINT AVCON_1198236379_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
 /
      
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1197644793_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1197644793_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1198236379_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1197644793_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1198236379_PRTY__000 CHECK (PRTY_TYPE 
 IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
 )))
 /
@@ -475,74 +517,79 @@ OR
 
 PROMPT Creating Check Constraint on 'DOCUMENT_ROLES'
 ALTER TABLE DOCUMENT_ROLES
- ADD (CONSTRAINT AVCON_1197644793_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
+ ADD (CONSTRAINT AVCON_1198236379_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
 /
-   
+  
+PROMPT Creating Check Constraint on 'QUOTE_ITEMS'
+ALTER TABLE QUOTE_ITEMS
+ ADD (CONSTRAINT AVCON_1198236379_QUIT__000 CHECK (QUIT_TYPE IN ('AQI', 'BQI', 'HQI', 'MQI', 'QUIT', 'LQI')))
+/
+ 
 PROMPT Creating Check Constraint on 'ROLE_TYPES'
 ALTER TABLE ROLE_TYPES
- ADD (CONSTRAINT AVCON_1197644793_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
+ ADD (CONSTRAINT AVCON_1198236379_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
 /
-          
+             
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1198236379_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1198236379_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1198236379_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1198236379_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1197644793_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
+ ADD (CONSTRAINT AVCON_1198236379_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /
-                
+              
 
 PROMPT Creating Foreign Key on 'REGULATORS'
 ALTER TABLE REGULATORS ADD (CONSTRAINT
@@ -617,6 +664,13 @@ ALTER TABLE PARTY_ADDRESS_ROLES ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'QUOTE_REASONING'
+ALTER TABLE QUOTE_REASONING ADD (CONSTRAINT
+ QURE_ENQU_FK FOREIGN KEY 
+  (ENQU_ID) REFERENCES ENQUIRIES
+  (ID))
+/
+
 PROMPT Creating Foreign Key on 'COSTS'
 ALTER TABLE COSTS ADD (CONSTRAINT
  COST_ENTY_FK FOREIGN KEY 
@@ -652,6 +706,13 @@ ALTER TABLE COSTS ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'COSTS'
+ALTER TABLE COSTS ADD (CONSTRAINT
+ COST_ADIT_FK FOREIGN KEY 
+  (ADIT_CODE) REFERENCES ADDITIONAL_ITEMS
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'COSTS'
 ALTER TABLE COSTS ADD (CONSTRAINT
  COST_REGI_FK FOREIGN KEY 
@@ -857,8 +918,36 @@ ALTER TABLE DOCUMENT_ROLES ADD (CONSTRAINT
 
 PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
- QUIT_BAS_FK FOREIGN KEY 
-  (BAS_CODE) REFERENCES BASES
+ QUIT_SVCPT_FK FOREIGN KEY 
+  (SVCPT_CODE) REFERENCES SERVICE_PRESSURE_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
+ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
+ QUIT_MESC_FK FOREIGN KEY 
+  (MESC_CODE) REFERENCES METER_SIZE_CODES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
+ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
+ QUIT_ENTY_FK FOREIGN KEY 
+  (ENTY_CODE) REFERENCES ENQUIRY_TYPES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
+ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
+ QUIT_ADIT_FK FOREIGN KEY 
+  (ADIT_CODE) REFERENCES ADDITIONAL_ITEMS
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
+ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
+ QUIT_HOU_FK FOREIGN KEY 
+  (HOU_CODE) REFERENCES HOUSINGS
   (CODE))
 /
 
@@ -871,8 +960,15 @@ ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
 
 PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
- QUIT_HOU_FK FOREIGN KEY 
-  (HOU_CODE) REFERENCES HOUSINGS
+ QUIT_BAS_FK FOREIGN KEY 
+  (BAS_CODE) REFERENCES BASES
+  (CODE))
+/
+
+PROMPT Creating Foreign Key on 'QUOTE_ITEMS'
+ALTER TABLE QUOTE_ITEMS ADD (CONSTRAINT
+ QUIT_METY_FK FOREIGN KEY 
+  (METY_CODE) REFERENCES METER_TYPES
   (CODE))
 /
 
@@ -946,6 +1042,13 @@ ALTER TABLE ENQUIRY_ROLES ADD (CONSTRAINT
   (CODE))
 /
 
+PROMPT Creating Foreign Key on 'BASES'
+ALTER TABLE BASES ADD (CONSTRAINT
+ BAS_DRWG_FK FOREIGN KEY 
+  (DRWG_CODE) REFERENCES DRAWINGS
+  (CODE))
+/
+
 PROMPT Creating Foreign Key on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES ADD (CONSTRAINT
  ENQU_ALTY_FK FOREIGN KEY 
@@ -1002,13 +1105,6 @@ ALTER TABLE ENQUIRIES ADD (CONSTRAINT
   (CODE))
 /
 
-PROMPT Creating Foreign Key on 'BASES'
-ALTER TABLE BASES ADD (CONSTRAINT
- BAS_DRWG_FK FOREIGN KEY 
-  (DRWG_CODE) REFERENCES DRAWINGS
-  (CODE))
-/
-
 PROMPT Creating Foreign Key on 'PARTY_RELATIONSHIP_TYPES'
 ALTER TABLE PARTY_RELATIONSHIP_TYPES ADD (CONSTRAINT
  PRTP_RT_FROM_FK FOREIGN KEY 
diff --git a/Schema/mip.ind b/Schema/mip.ind
index dd89168..1d446d8 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 Dec 14  15:06:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Dec 21  11:26:20 2007 by Server Generator 10.1.2.6.18
   
 
 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -53,9 +53,9 @@ CREATE INDEX PAR_RT_FK_I ON PARTY_ADDRESS_ROLES
  (RT_CODE)
 /
 
-PROMPT Creating Index 'COST_AICO_UK_I'
-CREATE UNIQUE INDEX COST_AICO_UK_I ON COSTS
- (case when aico_code is null then null else aico_code||':'||regi_code||':'||valid_from end)
+PROMPT Creating Index 'QURE_ENQU_FK_I'
+CREATE INDEX QURE_ENQU_FK_I ON QUOTE_REASONING
+ (ENQU_ID)
 /
 
 PROMPT Creating Index 'COST_METY_FK_I'
@@ -68,6 +68,11 @@ CREATE INDEX COST_SVCPT_FK_I ON COSTS
  (SVCPT_CODE)
 /
 
+PROMPT Creating Index 'COST_ADIT_FK_I'
+CREATE INDEX COST_ADIT_FK_I ON COSTS
+ (ADIT_CODE)
+/
+
 PROMPT Creating Index 'COST_MESC_FK_I'
 CREATE INDEX COST_MESC_FK_I ON COSTS
  (MESC_CODE)
@@ -235,16 +240,41 @@ CREATE INDEX QUIT_QUTE_FK_I ON QUOTE_ITEMS
  (QUTE_ID)
 /
 
+PROMPT Creating Index 'QUIT_SVCPT_FK_I'
+CREATE INDEX QUIT_SVCPT_FK_I ON QUOTE_ITEMS
+ (SVCPT_CODE)
+/
+
 PROMPT Creating Index 'QUIT_MODU_FK_I'
 CREATE INDEX QUIT_MODU_FK_I ON QUOTE_ITEMS
  (MODU_CODE)
 /
 
+PROMPT Creating Index 'QUIT_METY_FK_I'
+CREATE INDEX QUIT_METY_FK_I ON QUOTE_ITEMS
+ (METY_CODE)
+/
+
 PROMPT Creating Index 'QUIT_BAS_FK_I'
 CREATE INDEX QUIT_BAS_FK_I ON QUOTE_ITEMS
  (BAS_CODE)
 /
 
+PROMPT Creating Index 'QUIT_MESC_FK_I'
+CREATE INDEX QUIT_MESC_FK_I ON QUOTE_ITEMS
+ (MESC_CODE)
+/
+
+PROMPT Creating Index 'QUIT_ADIT_FK_I'
+CREATE INDEX QUIT_ADIT_FK_I ON QUOTE_ITEMS
+ (ADIT_CODE)
+/
+
+PROMPT Creating Index 'QUIT_ENTY_FK_I'
+CREATE INDEX QUIT_ENTY_FK_I ON QUOTE_ITEMS
+ (ENTY_CODE)
+/
+
 PROMPT Creating Index 'QUIT_HOU_FK_I'
 CREATE INDEX QUIT_HOU_FK_I ON QUOTE_ITEMS
  (HOU_CODE)
@@ -295,6 +325,11 @@ CREATE INDEX ENRO_ENQU_FK_I ON ENQUIRY_ROLES
  (ENQU_ID)
 /
 
+PROMPT Creating Index 'BAS_DRWG_FK_I'
+CREATE INDEX BAS_DRWG_FK_I ON BASES
+ (DRWG_CODE)
+/
+
 PROMPT Creating Index 'ENQU_METY_FK_I'
 CREATE INDEX ENQU_METY_FK_I ON ENQUIRIES
  (METY_CODE)
@@ -335,11 +370,6 @@ CREATE INDEX ENQU_SVCP_REQUIRED_FK_I ON ENQUIRIES
  (REQUIRED_SVCP_CODE)
 /
 
-PROMPT Creating Index 'BAS_DRWG_FK_I'
-CREATE INDEX BAS_DRWG_FK_I ON BASES
- (DRWG_CODE)
-/
-
 PROMPT Creating Index 'PRTP_RT_TO_FK_I'
 CREATE INDEX PRTP_RT_TO_FK_I ON PARTY_RELATIONSHIP_TYPES
  (TO_RT_CODE)
diff --git a/Schema/mip.sql b/Schema/mip.sql
index 9146c7e..5399ca3 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 Dec 14  15:06:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Dec 21  11:26:20 2007 by Server Generator 10.1.2.6.18
 
 
 SPOOL mip.lst
diff --git a/Schema/mip.sqs b/Schema/mip.sqs
index 6ccf2fc..3d1b61d 100644
--- a/Schema/mip.sqs
+++ b/Schema/mip.sqs
@@ -1,9 +1,10 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sqs
 --
--- Generated for Oracle 10g on Fri Dec 14  15:06:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Dec 21  11:26:20 2007 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Sequence 'ENQU_SEQ'
 CREATE SEQUENCE ENQU_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -11,6 +12,7 @@ CREATE SEQUENCE ENQU_SEQ
 
 PROMPT Creating Sequence 'COST_SEQ'
 CREATE SEQUENCE COST_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -18,6 +20,7 @@ CREATE SEQUENCE COST_SEQ
 
 PROMPT Creating Sequence 'PRTY_SEQ'
 CREATE SEQUENCE PRTY_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -25,6 +28,7 @@ CREATE SEQUENCE PRTY_SEQ
 
 PROMPT Creating Sequence 'REEX_SEQ'
 CREATE SEQUENCE REEX_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -32,6 +36,7 @@ CREATE SEQUENCE REEX_SEQ
 
 PROMPT Creating Sequence 'DORO_SEQ'
 CREATE SEQUENCE DORO_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -39,6 +44,7 @@ CREATE SEQUENCE DORO_SEQ
 
 PROMPT Creating Sequence 'QUTE_SEQ'
 CREATE SEQUENCE QUTE_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -46,6 +52,7 @@ CREATE SEQUENCE QUTE_SEQ
 
 PROMPT Creating Sequence 'POCO_SEQ'
 CREATE SEQUENCE POCO_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -53,6 +60,15 @@ CREATE SEQUENCE POCO_SEQ
 
 PROMPT Creating Sequence 'DOCU_SEQ'
 CREATE SEQUENCE DOCU_SEQ
+ START WITH 20080000
+ NOMAXVALUE
+ NOMINVALUE
+ NOCYCLE
+/
+
+PROMPT Creating Sequence 'QURE_SEQ'
+CREATE SEQUENCE QURE_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
@@ -60,6 +76,7 @@ CREATE SEQUENCE DOCU_SEQ
 
 PROMPT Creating Sequence 'COME_SEQ'
 CREATE SEQUENCE COME_SEQ
+ START WITH 20080000
  NOMAXVALUE
  NOMINVALUE
  NOCYCLE
diff --git a/Schema/mip.tab b/Schema/mip.tab
index 5555070..50356d1 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 Dec 14  15:06:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Fri Dec 21  11:26:19 2007 by Server Generator 10.1.2.6.18
  
 
 
@@ -10,6 +10,7 @@ CREATE TABLE SYSTEM_CONFIGURATION
  ,VALUE VARCHAR2(240)
  ,DESCRIPTION VARCHAR2(240)
  )
+ NOCACHE
 /
 
 PROMPT Creating Table 'REGULATORS'
@@ -93,6 +94,15 @@ CREATE TABLE PARTY_ADDRESS_ROLES
  )
 /
 
+PROMPT Creating Table 'QUOTE_REASONING'
+CREATE TABLE QUOTE_REASONING
+ (REASON VARCHAR2(240) NOT NULL
+ ,INTERNAL_OR_EXTERNAL VARCHAR2(8) DEFAULT 'EXTERNAL' NOT NULL
+ ,ENQU_ID NUMBER
+ ,ID NUMBER(*,0) NOT NULL
+ )
+/
+
 PROMPT Creating Table 'DATA_ITEM_ROLES_IMPORT'
 CREATE TABLE DATA_ITEM_ROLES_IMPORT
  (FIELD_NAME VARCHAR2(240)
@@ -113,6 +123,13 @@ CREATE TABLE DATA_ITEM_ROLES_IMPORT
  )
 /
 
+PROMPT Creating Table 'CONNECTION_ORIENTATIONS'
+CREATE TABLE CONNECTION_ORIENTATIONS
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
 PROMPT Creating Table 'METER_SIZE_CODES'
 CREATE TABLE METER_SIZE_CODES
  (CODE VARCHAR2(80) NOT NULL
@@ -123,20 +140,12 @@ CREATE TABLE METER_SIZE_CODES
  )
 /
 
-PROMPT Creating Table 'CONNECTION_ORIENTATIONS'
-CREATE TABLE CONNECTION_ORIENTATIONS
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'COSTS'
 CREATE TABLE COSTS
- (AICO_CODE VARCHAR2(80)
+ (REGI_CODE VARCHAR2(80)
  ,COST_PRICE NUMBER(*,2)
- ,DESCRIPTION VARCHAR2(80)
+ ,ADIT_CODE VARCHAR2(240)
  ,VALID_FROM DATE NOT NULL
- ,REGI_CODE VARCHAR2(80)
  ,BAS_CODE VARCHAR2(80)
  ,SELLING_PRICE NUMBER(*,2) NOT NULL
  ,DELIVERY_COST NUMBER(*,2)
@@ -224,7 +233,6 @@ CREATE TABLE PARTY_RELATIONSHIPS
 PROMPT Creating Table 'QUOTES'
 CREATE TABLE QUOTES
  (ENQU_ID NUMBER NOT NULL
- ,DOCUMENT_LOCATION VARCHAR2(255)
  ,VALID_FROM DATE
  ,VALID_UNTIL DATE
  ,CREATED_ON DATE NOT NULL
@@ -337,13 +345,21 @@ CREATE TABLE DATA_ITEMS
 
 PROMPT Creating Table 'QUOTE_ITEMS'
 CREATE TABLE QUOTE_ITEMS
- (ITEM_SEQUENCE NUMBER NOT NULL
- ,QUTE_ID NUMBER NOT NULL
- ,BAS_CODE VARCHAR2(80)
- ,HOU_CODE VARCHAR2(80)
- ,MODU_CODE VARCHAR2(80)
- ,COST_PRICE NUMBER
+ (MODU_CODE VARCHAR2(80)
+ ,ITEM_SEQUENCE NUMBER NOT NULL
  ,SELLING_PRICE NUMBER
+ ,ENTY_CODE VARCHAR2(80)
+ ,QUTE_ID NUMBER NOT NULL
+ ,COST_PRICE NUMBER
+ ,ADIT_CODE VARCHAR2(240)
+ ,BAS_CODE VARCHAR2(80)
+ ,SVCPT_CODE VARCHAR2(80)
+ ,DELIVERY_PRICE NUMBER
+ ,LEAD_TIME NUMBER
+ ,HOU_CODE VARCHAR2(80)
+ ,MESC_CODE VARCHAR2(80)
+ ,METY_CODE VARCHAR2(80)
+ ,QUIT_TYPE VARCHAR2(10) NOT NULL
  )
 /
 
@@ -374,7 +390,6 @@ CREATE TABLE ASSET_LOCATION_TYPES
 PROMPT Creating Table 'METERS'
 CREATE TABLE METERS
  (CODE VARCHAR2(80) NOT NULL
- ,DRWG_CODE VARCHAR2(80)
  ,METY_CODE VARCHAR2(80) NOT NULL
  ,PRTY_ID NUMBER NOT NULL
  ,DIM_A NUMBER NOT NULL
@@ -382,10 +397,11 @@ CREATE TABLE METERS
  ,DIM_C NUMBER NOT NULL
  ,CENTRES NUMBER NOT NULL
  ,WEIGHT NUMBER NOT NULL
- ,Q_MAX NUMBER NOT NULL
- ,Q_MIN NUMBER NOT NULL
- ,Q_NOM NUMBER NOT NULL
+ ,QMAX NUMBER NOT NULL
+ ,QMIN NUMBER NOT NULL
+ ,QNOM NUMBER NOT NULL
  ,VALID_FROM DATE NOT NULL
+ ,DRWG_CODE VARCHAR2(80)
  ,VALID_TO DATE
  )
 /
@@ -477,6 +493,38 @@ CREATE TABLE ENQUIRY_ROLES
  )
 /
 
+PROMPT Creating Table 'BASES'
+CREATE TABLE BASES
+ (CODE VARCHAR2(80) NOT NULL
+ ,DRWG_CODE VARCHAR2(80)
+ ,DESCRIPTION VARCHAR2(80)
+ ,DIM_A NUMBER
+ ,DIM_B NUMBER
+ ,DIM_C NUMBER
+ ,DIM_D NUMBER
+ ,DIM_E NUMBER
+ ,DIM_F NUMBER
+ ,DIM_G NUMBER
+ ,DIM_H NUMBER
+ ,DIM_I NUMBER
+ ,DEPTH NUMBER
+ )
+/
+
+PROMPT Creating Table 'HOUSING_TYPES'
+CREATE TABLE HOUSING_TYPES
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
+PROMPT Creating Table 'SLAMSHUT_TYPES'
+CREATE TABLE SLAMSHUT_TYPES
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
 PROMPT Creating Table 'ENQUIRIES'
 CREATE TABLE ENQUIRIES
  (ID NUMBER NOT NULL
@@ -550,37 +598,6 @@ CREATE TABLE ENQUIRIES
  )
 /
 
-PROMPT Creating Table 'BASES'
-CREATE TABLE BASES
- (CODE VARCHAR2(80) NOT NULL
- ,DRWG_CODE VARCHAR2(80)
- ,DESCRIPTION VARCHAR2(80)
- ,DIM_A NUMBER
- ,DIM_B NUMBER
- ,DIM_C NUMBER
- ,DIM_D NUMBER
- ,DIM_E NUMBER
- ,DIM_F NUMBER
- ,DIM_G NUMBER
- ,DIM_H NUMBER
- ,DIM_I NUMBER
- )
-/
-
-PROMPT Creating Table 'HOUSING_TYPES'
-CREATE TABLE HOUSING_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
-PROMPT Creating Table 'SLAMSHUT_TYPES'
-CREATE TABLE SLAMSHUT_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'PARTY_RELATIONSHIP_TYPES'
 CREATE TABLE PARTY_RELATIONSHIP_TYPES
  (TO_RT_CODE VARCHAR2(80) NOT NULL
@@ -589,13 +606,6 @@ CREATE TABLE PARTY_RELATIONSHIP_TYPES
  )
 /
 
-PROMPT Creating Table 'METER_TYPES'
-CREATE TABLE METER_TYPES
- (CODE VARCHAR2(80) NOT NULL
- ,DESCRIPTION VARCHAR2(80)
- )
-/
-
 PROMPT Creating Table 'APEX_AUTHORIZATION'
 CREATE TABLE APEX_AUTHORIZATION
  (RT_CODE VARCHAR2(80) NOT NULL
@@ -605,6 +615,13 @@ CREATE TABLE APEX_AUTHORIZATION
  )
 /
 
+PROMPT Creating Table 'METER_TYPES'
+CREATE TABLE METER_TYPES
+ (CODE VARCHAR2(80) NOT NULL
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
 PROMPT Creating Table 'MODULES'
 CREATE TABLE MODULES
  (CODE VARCHAR2(80) NOT NULL
@@ -620,8 +637,8 @@ CREATE TABLE MODULES
  ,REVA_CODE VARCHAR2(80) NOT NULL
  ,SLVA_CODE VARCHAR2(80) NOT NULL
  ,SVCP_CODE VARCHAR2(80) NOT NULL
+ ,LEAD_TIME NUMBER
  ,WEIGHT NUMBER NOT NULL
- ,INLET_PRESSURE NUMBER NOT NULL
  ,INLET_HEIGHT NUMBER NOT NULL
  ,INLET_SIZE NUMBER NOT NULL
  ,OUTLET_PRESSURE NUMBER NOT NULL
@@ -650,7 +667,7 @@ CREATE TABLE HOUSINGS
  ,HOTY_CODE VARCHAR2(80) NOT NULL
  ,PRTY_ID NUMBER NOT NULL
  ,DESCRIPTION VARCHAR2(80)
- ,DIM_L VARCHAR2(240) NOT NULL
+ ,DIM_L NUMBER NOT NULL
  ,DIM_W NUMBER NOT NULL
  ,DIM_H NUMBER NOT NULL
  ,WEIGHT NUMBER NOT NULL
@@ -700,6 +717,14 @@ CREATE TABLE EXCEPTION_MESSAGES
  )
 /
 
+PROMPT Creating Table 'ADDITIONAL_ITEMS'
+CREATE TABLE ADDITIONAL_ITEMS
+ (CODE VARCHAR2(240) NOT NULL
+ ,DESCRIPTION VARCHAR2(240)
+ ,LEAD_TIME VARCHAR2(240)
+ )
+/
+
 PROMPT Creating Table 'DRAWINGS'
 CREATE TABLE DRAWINGS
  (CODE VARCHAR2(80) NOT NULL