diff --git a/Data/Demo/InstallDemoData.cmd b/Data/Demo/InstallData.cmd
similarity index 100%
rename from Data/Demo/InstallDemoData.cmd
rename to Data/Demo/InstallData.cmd
diff --git a/Data/Seed/cnor.ctl b/Data/Seed/cnor.ctl
index 56da8da..a97a543 100644
--- a/Data/Seed/cnor.ctl
+++ b/Data/Seed/cnor.ctl
@@ -5,12 +5,12 @@ REPLACE
 FIELDS TERMINATED BY '|'
 (
 description
-,id
+,code
 )
 BEGINDATA
-Vertical Up|1
-Vertical Down|3
-Horizontal Left|2
-Horizontal Right|4
-Horizontal Back|5
-Horizontal Front|6
+Vertical Up|VERTICAL UP
+Vertical Down|VERTICAL DOWN
+Horizontal Left|HORIZONTAL LEFT
+Horizontal Right|HORIZONTAL RIGHT
+Horizontal Back|HORIZONTAL BACK
+Horizontal Front|HORIZONTAL FRONT
diff --git a/Data/Test/InstallDemoData.cmd b/Data/Test/InstallData.cmd
similarity index 100%
rename from Data/Test/InstallDemoData.cmd
rename to Data/Test/InstallData.cmd
diff --git a/InstallMIP.cmd b/InstallMIP.cmd
index 6e01cd9..6449662 100644
--- a/InstallMIP.cmd
+++ b/InstallMIP.cmd
@@ -6,6 +6,7 @@ if "%3"=="" goto :usage
 if "%4"=="" goto :usage
 if "%5"=="" goto :usage
 
+
 @echo Install Schema
 sqlplus /nolog @Schema\InstallMIP %1 %2 %3 %4 %5
 
@@ -14,20 +15,37 @@ sqlplus /nolog @Schema\InstallMIP %1 %2 %3 %4 %5
 sqlplus %3/%4@%5 @Modules\Modules.sql
 
 
+@echo Install Seed
 cd Data\Seed
 call InstallSeed %3/%4@%5
 cd ..\..
+@echo Seed Complete
 
+if "%6"=="" goto :done
 
+goto "%6"
+
+:demo
+@echo Demo
 cd Data\Demo
-call InstallDemoData %3/%4@%5
+call InstallData %3/%4@%5
 cd ..\..
+@echo Demo Complete
+
+goto :done
+
+:test
+@echo Install Test
+cd Data\test
+call InstallData %3/%4@%5
+cd ..\..
+@echo Test Complete
 
 goto :done
 
 :usage
 
-echo usage 		InstallMIP sys_name sys_password app_name app_password db_connect_string
+echo usage 		InstallMIP sys_name sys_password app_name app_password [demo|test]db_connect_string
 
 
 :done
diff --git a/Schema/InstallMIP.sql b/Schema/InstallMIP.sql
index 48e5764..b57a19f 100644
--- a/Schema/InstallMIP.sql
+++ b/Schema/InstallMIP.sql
@@ -2,7 +2,7 @@ connect &1/&2@&5 as sysdba
 
 drop user &3 cascade;
 
-grant connect, resource to &3 identified by &4;
+grant connect, resource, create any view to &3 identified by &4;
 
 connect &3/&4@&5
 
diff --git a/Schema/mip.con b/Schema/mip.con
index 7ae1550..4d92a90 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 26  14:57:47 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Nov 27  16:17:26 2007 by Server Generator 10.1.2.6.18
   
 PROMPT Creating Primary Key on 'SYSTEM_CONFIGURATION'
 ALTER TABLE SYSTEM_CONFIGURATION
@@ -339,6 +339,12 @@ ALTER TABLE FILTER_TYPES
   (CODE))
 /
 
+PROMPT Creating Primary Key on 'EXCEPTION_MESSAGES'
+ALTER TABLE EXCEPTION_MESSAGES
+ ADD (CONSTRAINT EXME_PK PRIMARY KEY 
+  (EXCEPTION_NUMBER))
+/
+
 PROMPT Creating Primary Key on 'DRAWINGS'
 ALTER TABLE DRAWINGS
  ADD (CONSTRAINT DRWG_PK PRIMARY KEY 
@@ -373,20 +379,20 @@ ALTER TABLE POSTCODES
   ,INCODE))
 /
 
-           
+            
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1196089066_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_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_1196089066_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
  
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1196089066_COST__000 CHECK (COST_TYPE IN ('HOCO', 'BACO', 'MECO', 'COST', 'AICO', 'LACO')))
+ ADD (CONSTRAINT AVCON_1196180246_COST__000 CHECK (COST_TYPE IN ('HOCO', 'BACO', 'MECO', 'COST', 'AICO', 'LACO')))
 /
        
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -398,86 +404,86 @@ to_parl_rt_code = to_prtp_rt_code))
  
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1196089066_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'AQ', 'SQ', 'MQ')))
+ ADD (CONSTRAINT AVCON_1196180246_QUTE__000 CHECK (QUTE_TYPE IN ('QUTE', 'AQ', 'SQ', 'MQ')))
 /
      
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1196089066_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1196180246_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1196089066_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1196180246_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_1196089066_RT_TY_000 CHECK (RT_TYPE IN ('ENRT', 'QURT', 'PRT', 'PCMRT', 'PART', 'RT')))
+ ADD (CONSTRAINT AVCON_1196180246_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_1196089066_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1196180246_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_LOGGE_000 CHECK (LOGGER_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1196180246_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1196180246_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1196180246_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1196089066_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
+ ADD (CONSTRAINT AVCON_1196180246_EXIST_000 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /
-              
+               
 
 PROMPT Creating Foreign Key on 'REGULATORS'
 ALTER TABLE REGULATORS ADD (CONSTRAINT
diff --git a/Schema/mip.ind b/Schema/mip.ind
index 1a83cd8..f399821 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 26  14:57:47 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Nov 27  16:17:26 2007 by Server Generator 10.1.2.6.18
   
 
 PROMPT Creating Index 'REGU_RETY_FK_I'
@@ -271,11 +271,6 @@ CREATE INDEX ENRO_ENQU_FK_I ON ENQUIRY_ROLES
  (ENQU_ID)
 /
 
-PROMPT Creating Index 'ENRO_ENQ_OWN_ROLE_I'
-CREATE UNIQUE INDEX ENRO_ENQ_OWN_ROLE_I ON ENQUIRY_ROLES
- (mip_table_constraints.enq_rt_code(rt_code))
-/
-
 PROMPT Creating Index 'ENQU_METY_FK_I'
 CREATE INDEX ENQU_METY_FK_I ON ENQUIRIES
  (METY_CODE)
diff --git a/Schema/mip.sql b/Schema/mip.sql
index b0b4297..bf42e43 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 26  14:57:48 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Nov 27  16:17:27 2007 by Server Generator 10.1.2.6.18
 
 
 SPOOL mip.lst
diff --git a/Schema/mip.sqs b/Schema/mip.sqs
index c78c8ef..dfeae8f 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 26  14:57:47 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Nov 27  16:17:27 2007 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Sequence 'ENQU_SEQ'
 CREATE SEQUENCE ENQU_SEQ
diff --git a/Schema/mip.tab b/Schema/mip.tab
index 1fc3a76..bda23a5 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 26  14:57:47 2007 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Tue Nov 27  16:17:26 2007 by Server Generator 10.1.2.6.18
  
 
 
@@ -93,6 +93,26 @@ CREATE TABLE PARTY_ADDRESS_ROLES
  )
 /
 
+PROMPT Creating Table 'DATA_ITEM_ROLES_IMPORT'
+CREATE TABLE DATA_ITEM_ROLES_IMPORT
+ (FIELD_NAME VARCHAR2(240)
+ ,TABLE_NAME VARCHAR2(240)
+ ,INSTALL VARCHAR2(80)
+ ,STD_INSTALL VARCHAR2(80)
+ ,OFMAT VARCHAR2(80)
+ ,EXCHANGE VARCHAR2(80)
+ ,STD_EXCHANGE VARCHAR2(80)
+ ,REMOVE VARCHAR2(80)
+ ,STD_REMOVE VARCHAR2(80)
+ ,ADVERSARIAL VARCHAR2(80)
+ ,ALTERATION VARCHAR2(80)
+ ,CHANGE_CAPACITY VARCHAR2(80)
+ ,ADDON VARCHAR2(80)
+ ,OTHER VARCHAR2(80)
+ ,DESCRIPTION VARCHAR2(80)
+ )
+/
+
 PROMPT Creating Table 'METER_SIZE_CODES'
 CREATE TABLE METER_SIZE_CODES
  (CODE VARCHAR2(80) NOT NULL
@@ -634,6 +654,19 @@ CREATE TABLE FILTER_TYPES
  )
 /
 
+PROMPT Creating Table 'EXCEPTION_MESSAGES'
+CREATE TABLE EXCEPTION_MESSAGES
+ (EXCEPTION_NUMBER NUMBER NOT NULL
+ ,MESSAGE VARCHAR2(400) NOT NULL
+ ,EXME_TYPE VARCHAR2(1) NOT NULL
+ ,CREATED_BY NUMBER
+ ,CREATED_ON DATE NOT NULL
+ ,EXME_COMMENT VARCHAR2(1024)
+ ,UPDATED_BY NUMBER
+ ,UPDATED_ON DATE
+ )
+/
+
 PROMPT Creating Table 'DRAWINGS'
 CREATE TABLE DRAWINGS
  (CODE VARCHAR2(80) NOT NULL