diff --git a/Data/Seed/enrt.ctl b/Data/Seed/enrt.ctl
index 58d6a37..829a4f1 100644
--- a/Data/Seed/enrt.ctl
+++ b/Data/Seed/enrt.ctl
@@ -9,6 +9,7 @@ rt_type
 ,description
 )
 BEGINDATA
-ENRT|CREATOR|Created Enquiry
-ENRT|UPDATER|Updated Enquiry
-ENRT|RFQ|Request For Quotation
+ENRT|ENQ CREATE|Created Enquiry
+ENRT|ENQ OWN|Owner of Enquiry
+ENRT|ENQ AMEND|Amend Enquiry
+ENRT|ENQ RFQ|Submit Request For Quotation
diff --git a/Data/Seed/part.ctl b/Data/Seed/part.ctl
index d836f96..26f783b 100644
--- a/Data/Seed/part.ctl
+++ b/Data/Seed/part.ctl
@@ -1,7 +1,7 @@
 LOAD DATA
 INFILE *
 INTO TABLE role_types
-REPLACE
+APPEND
 FIELDS TERMINATED BY '|'
 (
 rt_type
diff --git a/Documentation/Design/ERD_ENQUIRY.png b/Documentation/Design/ERD_ENQUIRY.png
index 2721cd4..c77f690 100644
Binary files a/Documentation/Design/ERD_ENQUIRY.png and b/Documentation/Design/ERD_ENQUIRY.png differ
diff --git a/Schema/mip.con b/Schema/mip.con
index 33352a5..0a33249 100644
--- a/Schema/mip.con
+++ b/Schema/mip.con
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
--- Generated for Oracle 10g on Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  15:41:49 2007 by Server Generator 10.1.2.6.18
   
 PROMPT Creating Primary Key on 'REGULATORS'
 ALTER TABLE REGULATORS
@@ -324,17 +324,17 @@ ALTER TABLE COSTS
          
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1194861873_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_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_1194861873_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
  
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1194861873_COST__000 CHECK (COST_TYPE IN ('HOCO', 'BACO', 'COST', 'AICO', 'MOCO', 'MECO')))
+ ADD (CONSTRAINT AVCON_1194882109_COST__000 CHECK (COST_TYPE IN ('HOCO', 'BACO', 'COST', 'AICO', 'MOCO', 'MECO')))
 /
        
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -346,84 +346,84 @@ to_parl_rt_code = to_prtp_rt_code))
  
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1194861873_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'SQ', 'AQ', 'MQ')))
+ ADD (CONSTRAINT AVCON_1194882109_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'SQ', 'AQ', 'MQ')))
 /
      
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1194861873_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1194882109_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1194861873_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1194882109_PRTY__000 CHECK (PRTY_TYPE 
 IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
 )))
 /
    
 PROMPT Creating Check Constraint on 'ROLE_TYPES'
 ALTER TABLE ROLE_TYPES
- ADD (CONSTRAINT AVCON_1194861873_RT_TY_000 CHECK (RT_TYPE IN ('ENRT', 'QURT', 'PRT', 'PCMRT', 'PART', 'RT')))
+ ADD (CONSTRAINT AVCON_1194882109_RT_TY_000 CHECK (RT_TYPE IN ('ENRT', 'QURT', 'PRT', 'PCMRT', 'PART', 'RT')))
 /
           
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1194882109_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1194882109_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1194882109_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
+ ADD (CONSTRAINT AVCON_1194882109_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1194861873_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1194882109_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /
             
 
diff --git a/Schema/mip.ind b/Schema/mip.ind
index 1055243..c76d1bd 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 Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  15:41:49 2007 by Server Generator 10.1.2.6.18
   
 
 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -94,8 +94,8 @@ 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
+PROMPT Creating Index 'QURO_RT_FK_I'
+CREATE INDEX QURO_RT_FK_I ON QUOTE_ROLES
  (RT_CODE)
 /
 
@@ -269,8 +269,8 @@ CREATE INDEX ENQU_ALTY_FK_I ON ENQUIRIES
  (ALTY_CODE)
 /
 
-PROMPT Creating Index 'ENQU_COMT_FK_AGENT_I'
-CREATE INDEX ENQU_COMT_FK_AGENT_I ON ENQUIRIES
+PROMPT Creating Index 'ENQU_COMT_AGENT_FK_I'
+CREATE INDEX ENQU_COMT_AGENT_FK_I ON ENQUIRIES
  (AGENT_COMT_CODE)
 /
 
diff --git a/Schema/mip.sql b/Schema/mip.sql
index 8c3570f..97a4a00 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 Mon Nov 12  10:04:34 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  15:41:50 2007 by Server Generator 10.1.2.6.18
 
 
 SPOOL mip.lst
diff --git a/Schema/mip.sqs b/Schema/mip.sqs
index e7bd5aa..3397cfd 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 Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  15:41:50 2007 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Sequence 'FLTR_SEQ'
 CREATE SEQUENCE FLTR_SEQ
diff --git a/Schema/mip.tab b/Schema/mip.tab
index 0f5008a..4f5bbb8 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 Mon Nov 12  10:04:33 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Mon Nov 12  15:41:49 2007 by Server Generator 10.1.2.6.18
  
 
 
@@ -360,17 +360,11 @@ CREATE TABLE ACCESS_CONTROLS
 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
- ,REQUIRED_MESC_CODE VARCHAR2(80) NOT NULL
- ,REQUIRED_SVCP_CODE VARCHAR2(80) NOT NULL
+ ,CONSUMER_COMT_CODE VARCHAR2(80)
  ,CONSUMER_CONTACT_VALUE VARCHAR2(240)
- ,INSTALL_BUILDING VARCHAR2(40) NOT NULL
- ,INSTALL_CITY VARCHAR2(40) NOT NULL
- ,INSTALL_POSTCODE VARCHAR2(7) NOT NULL
+ ,INSTALL_BUILDING VARCHAR2(40)
+ ,INSTALL_CITY VARCHAR2(40)
+ ,INSTALL_POSTCODE VARCHAR2(7)
  ,ALT_BUILDING VARCHAR2(40)
  ,ASSET_LOCATION_NOTES VARCHAR2(100)
  ,MPRN INTEGER
@@ -385,26 +379,25 @@ CREATE TABLE ENQUIRIES
  ,EXISTING_METER_MODEL VARCHAR2(10)
  ,OTHER_INFORMATION VARCHAR2(250)
  ,CREATED_ON DATE NOT NULL
+ ,ALTY_CODE VARCHAR2(80)
+ ,CACA_CODE VARCHAR2(80)
+ ,ENTY_CODE VARCHAR2(80)
+ ,EXISTING_MESC_CODE VARCHAR2(80)
  ,EXISTING_SVCP_CODE VARCHAR2(80)
  ,METY_CODE VARCHAR2(80)
+ ,REQUIRED_MESC_CODE VARCHAR2(80)
+ ,REQUIRED_SVCP_CODE VARCHAR2(80)
  ,AGENT_CONTACT_VALUE VARCHAR2(240)
  ,TRANSACTION_REFERENCE VARCHAR2(80)
  ,CONSUMER_NAME VARCHAR2(80)
  ,INSTALL_SUB_BUILDING VARCHAR2(40)
- ,INSTALL_STREET VARCHAR2(60) NOT NULL
- ,ALT_CONSUMER_COMT_CODE VARCHAR2(80)
- ,EXISTING_MESC_CODE VARCHAR2(80)
+ ,INSTALL_STREET VARCHAR2(60)
  ,ALT_CONSUMER_NAME VARCHAR2(80)
- ,ALT_CONSUMER_CONTACT_VALUE VARCHAR2(240)
- ,ALT_SUB_BUILDING VARCHAR2(40)
  ,ALT_STREET VARCHAR2(60)
  ,ALT_CITY VARCHAR2(40)
  ,ALT_POSTCODE VARCHAR2(7)
  ,ACCESS_PASSWORD VARCHAR2(30)
  ,ACCESS_ADDITIONAL VARCHAR2(210)
- ,MPRN_ALT VARCHAR2(250)
- ,ANNUAL_QUANTITY NUMBER
- ,DOWNSTREAM_BOOSTER_OR_COMPRESS VARCHAR2(3)
  ,INDICATIVE_DATE DATE
  ,INDICATIVE_TIME VARCHAR2(2) DEFAULT 'DY'
  ,OTHER_PROJECT_REFERENCE VARCHAR2(50)
@@ -413,14 +406,21 @@ CREATE TABLE ENQUIRIES
  ,EMS_REQUIRED VARCHAR2(3)
  ,BYPASS_REQUIRED VARCHAR2(40)
  ,LOGGER_REQUIRED VARCHAR2(3)
- ,QMIN NUMBER
  ,LOAD_CONTROL_TYPE VARCHAR2(10)
- ,EXISTING_METER_SERIAL_NO VARCHAR2(14)
- ,EXISTING_METER_OWNER VARCHAR2(1)
  ,EXISTING_METER_ASSET_PROVIDER VARCHAR2(210)
  ,MARKET_SECTOR_CODE VARCHAR2(1) DEFAULT 'I'
  ,JOB_DESCRIPTION VARCHAR2(500)
  ,CREATED_BY NUMBER NOT NULL
+ ,AGENT_COMT_CODE VARCHAR2(80)
+ ,ALT_CONSUMER_COMT_CODE VARCHAR2(80)
+ ,ALT_CONSUMER_CONTACT_VALUE VARCHAR2(240)
+ ,ALT_SUB_BUILDING VARCHAR2(40)
+ ,MPRN_ALT VARCHAR2(250)
+ ,ANNUAL_QUANTITY NUMBER
+ ,DOWNSTREAM_BOOSTER_OR_COMPRESS VARCHAR2(3)
+ ,QMIN NUMBER
+ ,EXISTING_METER_SERIAL_NO VARCHAR2(14)
+ ,EXISTING_METER_OWNER VARCHAR2(1)
  ,UPDATED_BY NUMBER
  ,UPDATED_ON DATE
  )