diff --git a/screening/source/sql/postgresql/_ERD/schema.dez b/screening/source/sql/postgresql/_ERD/schema.dez
index 66d66f28ab2ea33904ac7283b20d1fec00fa506d..6ddf7c06d6339bc57cb2e444d52ea126a2ccdc29 100644
--- a/screening/source/sql/postgresql/_ERD/schema.dez
+++ b/screening/source/sql/postgresql/_ERD/schema.dez
@@ -4,14 +4,14 @@
 <VERSION>
 <PROJECTSETTINGS>
 <PROJECTFILENAME>\\nas-bsse\share-1-$\group\cisd\screening\datamodel\003\schema-003.dez</PROJECTFILENAME>
-<MODIFIED>2010-06-14</MODIFIED>
+<MODIFIED>2010-11-26</MODIFIED>
 <CREATED>2010-06-14</CREATED>
 <CREATED2></CREATED2>
 <PROJECTNAME></PROJECTNAME>
 <DESCRIPTION></DESCRIPTION>
 <AUTHOR></AUTHOR>
 <COPYRIGHT></COPYRIGHT>
-<LASTGENERATEDFILES></LASTGENERATEDFILES>
+<LASTGENERATEDFILES>G:\ERD\DeZign\screening\create_postgresql.sql;G:\ERD\DeZign\screening\drop_postgresql.sql;\CreateDBLog_201011261.txt</LASTGENERATEDFILES>
 </PROJECTSETTINGS>
 <CONNECTIONSETTINGS>
 <SQLFILE>\\nas-bsse\share-1-$\group\cisd\screening\datamodel\003\schema-003.sql</SQLFILE>
@@ -20,7 +20,7 @@
 </CONNECTIONSETTINGS>
 <DATADICT>
 <DBID>postgresql83</DBID>
-<LASTID>34</LASTID>
+<LASTID>43</LASTID>
 <DDSETTINGS>
 <PKCONNAMETEMPLATE>PK_%table%</PKCONNAMETEMPLATE>
 <FKCONNAMETEMPLATE>%relname%</FKCONNAMETEMPLATE>
@@ -57,6 +57,8 @@
 <IGNORECOMMENTS>0</IGNORECOMMENTS>
 <USESCHEMANAMES>0</USESCHEMANAMES>
 <UCONNAMETEMPLATE></UCONNAMETEMPLATE>
+<SQLCREATEFILE>G:\ERD\DeZign\screening\create_postgresql.sql</SQLCREATEFILE>
+<SQLDROPFILE>G:\ERD\DeZign\screening\drop_postgresql.sql</SQLDROPFILE>
 </DDSETTINGS>
 <DOMAINS>
 <DOMAIN>
@@ -148,6 +150,30 @@
 </ATTRIBUTEIDS>
 </CCON>
 </DOMAIN>
+<DOMAIN>
+<NAME>BOOLEAN_CHAR</NAME>
+<ID>41</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<DT>
+<DTLISTNAME>BOOLEAN</DTLISTNAME>
+<SD>0</SD>
+<INC>1</INC>
+</DT>
+<DEFCON>
+<NAME></NAME>
+<ID>0</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<VALUE>FALSE</VALUE>
+<CONLEVEL>1</CONLEVEL>
+<CONTYPE>6</CONTYPE>
+<ATTRIBUTEIDS>
+</ATTRIBUTEIDS>
+</DEFCON>
+</DOMAIN>
 </DOMAINS>
 <ENTITIES>
 <ENT>
@@ -156,12 +182,13 @@
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
 <DESC></DESC>
-<ATTRLASTID>3</ATTRLASTID>
+<ATTRLASTID>4</ATTRLASTID>
 <IDXLASTID>1</IDXLASTID>
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>2</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_EXPERIMENTS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -226,10 +253,24 @@
 </ATTRIBUTEIDS>
 </NNCON>
 </ATTR>
+<ATTR>
+<NAME>IMAGE_TRANSFORMER_FACTORY BYTEA</NAME>
+<ID>4</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<DOMAINID>-1</DOMAINID>
+<DT>
+<DTLISTNAME>BYTEA</DTLISTNAME>
+<SD>0</SD>
+<INC>1</INC>
+</DT>
+</ATTR>
 </ATTRIBUTES>
 <CONSTRAINTS>
 <CONSTRAINT>
-<NAME></NAME>
+<NAME>TUC_EXPERIMENTS_1</NAME>
+<NAMETEMPLATE>TUC_%table%_%counter%</NAMETEMPLATE>
 <ID>2</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -254,7 +295,8 @@
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>2</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_CONTAINERS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -396,7 +438,8 @@
 </INDEXES>
 <CONSTRAINTS>
 <CONSTRAINT>
-<NAME></NAME>
+<NAME>TUC_CONTAINERS_1</NAME>
+<NAMETEMPLATE>TUC_%table%_%counter%</NAMETEMPLATE>
 <ID>2</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -417,11 +460,12 @@
 <SCHEMA></SCHEMA>
 <DESC></DESC>
 <ATTRLASTID>6</ATTRLASTID>
-<IDXLASTID>2</IDXLASTID>
+<IDXLASTID>3</IDXLASTID>
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>2</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_SPOTS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -460,33 +504,6 @@
 </NNCON>
 </ATTR>
 <ATTR>
-<NAME>PERM_ID</NAME>
-<ID>3</ID>
-<POSNR>0</POSNR>
-<SCHEMA></SCHEMA>
-<DESC></DESC>
-<DOMAINID>3</DOMAINID>
-<DT>
-<DTLISTNAME>CHARACTER VARYING</DTLISTNAME>
-<LE>40</LE>
-<SD>0</SD>
-<INC>1</INC>
-</DT>
-<NNCON>
-<NAME></NAME>
-<ID>1</ID>
-<POSNR>0</POSNR>
-<SCHEMA></SCHEMA>
-<DESC></DESC>
-<VALUE>1</VALUE>
-<CONLEVEL>1</CONLEVEL>
-<CONTYPE>5</CONTYPE>
-<ATTRIBUTEIDS>
-<ATTRIBUTEID>3</ATTRIBUTEID>
-</ATTRIBUTEIDS>
-</NNCON>
-</ATTR>
-<ATTR>
 <NAME>X</NAME>
 <ID>4</ID>
 <POSNR>0</POSNR>
@@ -560,21 +577,43 @@
 </IDXCOL>
 </IDXCOLS>
 </INDEX>
-</INDEXES>
-<CONSTRAINTS>
-<CONSTRAINT>
-<NAME></NAME>
-<ID>2</ID>
+<INDEX>
+<NAME>SPOTS_COORDS_IDX</NAME>
+<NAMETEMPLATE>SPOTS_COORDS_IDX</NAMETEMPLATE>
+<ID>3</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
 <DESC></DESC>
-<CONLEVEL>2</CONLEVEL>
-<CONTYPE>2</CONTYPE>
-<ATTRIBUTEIDS>
-<ATTRIBUTEID>3</ATTRIBUTEID>
-</ATTRIBUTEIDS>
-</CONSTRAINT>
-</CONSTRAINTS>
+<RELID>0</RELID>
+<AUTOIDXTYPE>0</AUTOIDXTYPE>
+<IDXCOLS>
+<IDXCOL>
+<NAME>X</NAME>
+<ID>0</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<IDXCOLATTRID>4</IDXCOLATTRID>
+</IDXCOL>
+<IDXCOL>
+<NAME>Y</NAME>
+<ID>0</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<IDXCOLATTRID>5</IDXCOLATTRID>
+</IDXCOL>
+<IDXCOL>
+<NAME>CONT_ID</NAME>
+<ID>0</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<IDXCOLATTRID>6</IDXCOLATTRID>
+</IDXCOL>
+</IDXCOLS>
+</INDEX>
+</INDEXES>
 </ENT>
 <ENT>
 <NAME>DATA_SETS</NAME>
@@ -583,12 +622,13 @@
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
 <DESC></DESC>
-<ATTRLASTID>6</ATTRLASTID>
+<ATTRLASTID>7</ATTRLASTID>
 <IDXLASTID>2</IDXLASTID>
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>2</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_DATA_SETS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -705,6 +745,47 @@
 </ATTRIBUTEIDS>
 </NNCON>
 </ATTR>
+<ATTR>
+<NAME>IS_MULTIDIMENSIONAL</NAME>
+<ID>7</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<DOMAINID>41</DOMAINID>
+<DT>
+<DTLISTNAME>BOOLEAN</DTLISTNAME>
+<SD>0</SD>
+<INC>1</INC>
+</DT>
+<NNCON>
+<NAME></NAME>
+<NAMETEMPLATE>NN_%column%</NAMETEMPLATE>
+<ID>1</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<VALUE>1</VALUE>
+<CONLEVEL>1</CONLEVEL>
+<CONTYPE>5</CONTYPE>
+<ATTRIBUTEIDS>
+<ATTRIBUTEID>7</ATTRIBUTEID>
+</ATTRIBUTEIDS>
+</NNCON>
+<DEFCON>
+<NAME></NAME>
+<NAMETEMPLATE>DEF_%table%_%column%</NAMETEMPLATE>
+<ID>2</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<VALUE>FALSE</VALUE>
+<CONLEVEL>1</CONLEVEL>
+<CONTYPE>6</CONTYPE>
+<ATTRIBUTEIDS>
+<ATTRIBUTEID>7</ATTRIBUTEID>
+</ATTRIBUTEIDS>
+</DEFCON>
+</ATTR>
 </ATTRIBUTES>
 <INDEXES>
 <INDEX>
@@ -730,7 +811,8 @@
 </INDEXES>
 <CONSTRAINTS>
 <CONSTRAINT>
-<NAME></NAME>
+<NAME>TUC_DATA_SETS_1</NAME>
+<NAMETEMPLATE>TUC_%table%_%counter%</NAMETEMPLATE>
 <ID>2</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -750,12 +832,13 @@
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
 <DESC></DESC>
-<ATTRLASTID>7</ATTRLASTID>
+<ATTRLASTID>9</ATTRLASTID>
 <IDXLASTID>2</IDXLASTID>
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>4</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_CHANNELS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -794,7 +877,49 @@
 </NNCON>
 </ATTR>
 <ATTR>
-<NAME>NAME</NAME>
+<NAME>CODE</NAME>
+<ID>8</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<DOMAINID>4</DOMAINID>
+<DT>
+<DTLISTNAME>CHARACTER VARYING</DTLISTNAME>
+<LE>80</LE>
+<SD>0</SD>
+<INC>1</INC>
+</DT>
+<NNCON>
+<NAME></NAME>
+<NAMETEMPLATE>NN_%column%</NAMETEMPLATE>
+<ID>1</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<VALUE>1</VALUE>
+<CONLEVEL>1</CONLEVEL>
+<CONTYPE>5</CONTYPE>
+<ATTRIBUTEIDS>
+<ATTRIBUTEID>8</ATTRIBUTEID>
+</ATTRIBUTEIDS>
+</NNCON>
+<CCON>
+<NAME>CC_CHANNELS_CODE</NAME>
+<NAMETEMPLATE>CC_%table%_%column%</NAMETEMPLATE>
+<ID>3</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<VALUE>VALUE IN ('RED', 'GREEN', 'BLUE')</VALUE>
+<CONLEVEL>1</CONLEVEL>
+<CONTYPE>1</CONTYPE>
+<ATTRIBUTEIDS>
+<ATTRIBUTEID>8</ATTRIBUTEID>
+</ATTRIBUTEIDS>
+</CCON>
+</ATTR>
+<ATTR>
+<NAME>LABEL</NAME>
 <ID>3</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -873,6 +998,19 @@
 <INC>1</INC>
 </DT>
 </ATTR>
+<ATTR>
+<NAME>IMAGE_TRANSFORMER_FACTORY</NAME>
+<ID>9</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<DOMAINID>-1</DOMAINID>
+<DT>
+<DTLISTNAME>BYTEA</DTLISTNAME>
+<SD>0</SD>
+<INC>1</INC>
+</DT>
+</ATTR>
 </ATTRIBUTES>
 <INDEXES>
 <INDEX>
@@ -923,8 +1061,8 @@
 <CONLEVEL>2</CONLEVEL>
 <CONTYPE>2</CONTYPE>
 <ATTRIBUTEIDS>
-<ATTRIBUTEID>3</ATTRIBUTEID>
 <ATTRIBUTEID>6</ATTRIBUTEID>
+<ATTRIBUTEID>8</ATTRIBUTEID>
 </ATTRIBUTEIDS>
 </CONSTRAINT>
 <CONSTRAINT>
@@ -937,8 +1075,8 @@
 <CONLEVEL>2</CONLEVEL>
 <CONTYPE>2</CONTYPE>
 <ATTRIBUTEIDS>
-<ATTRIBUTEID>3</ATTRIBUTEID>
 <ATTRIBUTEID>7</ATTRIBUTEID>
+<ATTRIBUTEID>8</ATTRIBUTEID>
 </ATTRIBUTEIDS>
 </CONSTRAINT>
 </CONSTRAINTS>
@@ -955,7 +1093,8 @@
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>1</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_CHANNEL_STACKS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1196,7 +1335,8 @@
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>1</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_IMAGES</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1312,10 +1452,11 @@
 <DESC></DESC>
 <ATTRLASTID>6</ATTRLASTID>
 <IDXLASTID>5</IDXLASTID>
-<TRGLASTID>1</TRGLASTID>
+<TRGLASTID>2</TRGLASTID>
 <CONLASTID>1</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_ACQUIRED_IMAGES</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1527,6 +1668,17 @@
 </IDXCOLS>
 </INDEX>
 </INDEXES>
+<TRIGGERS>
+<TRIGGER>
+<NAME>UNUSED_IMAGES</NAME>
+<ID>2</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<CODE>CREATE TRIGGER UNUSED_IMAGES AFTER DELETE ON ACQUIRED_IMAGES
+    FOR EACH ROW EXECUTE PROCEDURE DELETE_UNUSED_IMAGES();</CODE>
+</TRIGGER>
+</TRIGGERS>
 </ENT>
 <ENT>
 <NAME>EVENTS</NAME>
@@ -1574,12 +1726,13 @@
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
 <DESC></DESC>
-<ATTRLASTID>5</ATTRLASTID>
+<ATTRLASTID>6</ATTRLASTID>
 <IDXLASTID>2</IDXLASTID>
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>2</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_FEATURE_DEFS</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1618,7 +1771,35 @@
 </NNCON>
 </ATTR>
 <ATTR>
-<NAME>NAME</NAME>
+<NAME>CODE</NAME>
+<ID>6</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<DOMAINID>4</DOMAINID>
+<DT>
+<DTLISTNAME>CHARACTER VARYING</DTLISTNAME>
+<LE>80</LE>
+<SD>0</SD>
+<INC>1</INC>
+</DT>
+<NNCON>
+<NAME></NAME>
+<NAMETEMPLATE>NN_%column%</NAMETEMPLATE>
+<ID>1</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<VALUE>1</VALUE>
+<CONLEVEL>1</CONLEVEL>
+<CONTYPE>5</CONTYPE>
+<ATTRIBUTEIDS>
+<ATTRIBUTEID>6</ATTRIBUTEID>
+</ATTRIBUTEIDS>
+</NNCON>
+</ATTR>
+<ATTR>
+<NAME>LABEL</NAME>
 <ID>3</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1718,8 +1899,8 @@
 <CONLEVEL>2</CONLEVEL>
 <CONTYPE>2</CONTYPE>
 <ATTRIBUTEIDS>
-<ATTRIBUTEID>3</ATTRIBUTEID>
 <ATTRIBUTEID>5</ATTRIBUTEID>
+<ATTRIBUTEID>6</ATTRIBUTEID>
 </ATTRIBUTEIDS>
 </CONSTRAINT>
 </CONSTRAINTS>
@@ -1736,7 +1917,8 @@
 <TRGLASTID>1</TRGLASTID>
 <CONLASTID>1</CONLASTID>
 <PKCON>
-<NAME></NAME>
+<NAME>PK_FEATURE_VALUES</NAME>
+<NAMETEMPLATE>PK_%table%</NAMETEMPLATE>
 <ID>1</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1801,7 +1983,7 @@
 </DT>
 </ATTR>
 <ATTR>
-<NAME>VALUES</NAME>
+<NAME>_VALUES</NAME>
 <ID>5</ID>
 <POSNR>0</POSNR>
 <SCHEMA></SCHEMA>
@@ -1970,6 +2152,19 @@
 <SEQUENCES>
 </SEQUENCES>
 <PROCEDURES>
+<PROCEDURE>
+<NAME>DELETE_UNUSED_IMAGES</NAME>
+<ID>42</ID>
+<POSNR>0</POSNR>
+<SCHEMA></SCHEMA>
+<DESC></DESC>
+<CODE>CREATE OR REPLACE FUNCTION DELETE_UNUSED_IMAGES() RETURNS trigger AS $$
+BEGIN
+   delete from images where id = OLD.img_id or id = OLD.thumbnail_id;
+   RETURN NEW;
+END;
+$$ LANGUAGE 'plpgsql';</CODE>
+</PROCEDURE>
 </PROCEDURES>
 <VIEWS>
 </VIEWS>
@@ -2594,8 +2789,8 @@
 <ENTC>
 <ID>8</ID>
 <DIAGRAMID>1</DIAGRAMID>
-<W>89</W>
-<H>63</H>
+<W>236</W>
+<H>78</H>
 <L>100</L>
 <T>100</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2621,7 +2816,7 @@
 <ID>11</ID>
 <DIAGRAMID>1</DIAGRAMID>
 <W>77</W>
-<H>108</H>
+<H>93</H>
 <L>100</L>
 <T>100</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2633,8 +2828,8 @@
 <ENTC>
 <ID>13</ID>
 <DIAGRAMID>1</DIAGRAMID>
-<W>104</W>
-<H>108</H>
+<W>139</W>
+<H>123</H>
 <L>100</L>
 <T>100</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2646,8 +2841,8 @@
 <ENTC>
 <ID>15</ID>
 <DIAGRAMID>1</DIAGRAMID>
-<W>99</W>
-<H>123</H>
+<W>198</W>
+<H>153</H>
 <L>100</L>
 <T>100</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2712,7 +2907,7 @@
 <ID>28</ID>
 <DIAGRAMID>1</DIAGRAMID>
 <W>94</W>
-<H>93</H>
+<H>108</H>
 <L>100</L>
 <T>100</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2737,9 +2932,9 @@
 <ENTC>
 <ID>8</ID>
 <DIAGRAMID>2</DIAGRAMID>
-<W>136</W>
-<H>63</H>
-<L>300</L>
+<W>298</W>
+<H>78</H>
+<L>301</L>
 <T>0</T>
 <BRUSH>0,16777215</BRUSH>
 <PEN>0,1,4,0</PEN>
@@ -2764,7 +2959,7 @@
 <ID>11</ID>
 <DIAGRAMID>2</DIAGRAMID>
 <W>143</W>
-<H>108</H>
+<H>93</H>
 <L>0</L>
 <T>330</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2776,8 +2971,8 @@
 <ENTC>
 <ID>13</ID>
 <DIAGRAMID>2</DIAGRAMID>
-<W>166</W>
-<H>108</H>
+<W>234</W>
+<H>123</H>
 <L>210</L>
 <T>330</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2789,8 +2984,8 @@
 <ENTC>
 <ID>15</ID>
 <DIAGRAMID>2</DIAGRAMID>
-<W>170</W>
-<H>123</H>
+<W>269</W>
+<H>153</H>
 <L>660</L>
 <T>540</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2855,7 +3050,7 @@
 <ID>28</ID>
 <DIAGRAMID>2</DIAGRAMID>
 <W>164</W>
-<H>93</H>
+<H>108</H>
 <L>570</L>
 <T>330</T>
 <BRUSH>0,16777215</BRUSH>
@@ -2867,7 +3062,7 @@
 <ENTC>
 <ID>30</ID>
 <DIAGRAMID>2</DIAGRAMID>
-<W>136</W>
+<W>141</W>
 <H>123</H>
 <L>540</L>
 <T>120</T>
@@ -2913,19 +3108,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>189</X>
-<Y>132</Y>
+<X>99</X>
+<Y>139</Y>
 </POINT>
 <POINT>
-<X>143</X>
-<Y>132</Y>
+<X>147</X>
+<Y>139</Y>
 </POINT>
 <POINT>
-<X>143</X>
+<X>147</X>
 <Y>154</Y>
 </POINT>
 <POINT>
-<X>204</X>
+<X>99</X>
 <Y>154</Y>
 </POINT>
 </POINTS>
@@ -2945,16 +3140,16 @@
 <Y>154</Y>
 </POINT>
 <POINT>
-<X>154</X>
+<X>150</X>
 <Y>154</Y>
 </POINT>
 <POINT>
-<X>154</X>
-<Y>154</Y>
+<X>150</X>
+<Y>146</Y>
 </POINT>
 <POINT>
 <X>99</X>
-<Y>154</Y>
+<Y>146</Y>
 </POINT>
 </POINTS>
 </RELC>
@@ -2969,20 +3164,20 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>99</X>
+<X>204</X>
 <Y>154</Y>
 </POINT>
 <POINT>
-<X>154</X>
+<X>158</X>
 <Y>154</Y>
 </POINT>
 <POINT>
-<X>154</X>
-<Y>154</Y>
+<X>158</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>99</X>
-<Y>154</Y>
+<X>239</X>
+<Y>162</Y>
 </POINT>
 </POINTS>
 </RELC>
@@ -2997,20 +3192,20 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>99</X>
-<Y>154</Y>
+<X>239</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>158</X>
-<Y>154</Y>
+<X>169</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>158</X>
-<Y>162</Y>
+<X>169</X>
+<Y>176</Y>
 </POINT>
 <POINT>
-<X>99</X>
-<Y>162</Y>
+<X>298</X>
+<Y>176</Y>
 </POINT>
 </POINTS>
 </RELC>
@@ -3025,20 +3220,20 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>189</X>
-<Y>132</Y>
+<X>99</X>
+<Y>139</Y>
 </POINT>
 <POINT>
-<X>146</X>
-<Y>132</Y>
+<X>157</X>
+<Y>139</Y>
 </POINT>
 <POINT>
-<X>146</X>
-<Y>162</Y>
+<X>157</X>
+<Y>176</Y>
 </POINT>
 <POINT>
-<X>199</X>
-<Y>162</Y>
+<X>99</X>
+<Y>176</Y>
 </POINT>
 </POINTS>
 </RELC>
@@ -3054,14 +3249,14 @@
 <POINTS>
 <POINT>
 <X>177</X>
-<Y>154</Y>
+<Y>146</Y>
 </POINT>
 <POINT>
-<X>162</X>
-<Y>154</Y>
+<X>158</X>
+<Y>146</Y>
 </POINT>
 <POINT>
-<X>162</X>
+<X>158</X>
 <Y>169</Y>
 </POINT>
 <POINT>
@@ -3081,19 +3276,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>204</X>
-<Y>154</Y>
+<X>99</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>162</X>
-<Y>154</Y>
+<X>165</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>162</X>
+<X>165</X>
 <Y>169</Y>
 </POINT>
 <POINT>
-<X>215</X>
+<X>99</X>
 <Y>169</Y>
 </POINT>
 </POINTS>
@@ -3137,19 +3332,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>199</X>
-<Y>162</Y>
+<X>99</X>
+<Y>176</Y>
 </POINT>
 <POINT>
-<X>158</X>
-<Y>162</Y>
+<X>165</X>
+<Y>176</Y>
 </POINT>
 <POINT>
-<X>158</X>
+<X>165</X>
 <Y>154</Y>
 </POINT>
 <POINT>
-<X>238</X>
+<X>99</X>
 <Y>154</Y>
 </POINT>
 </POINTS>
@@ -3222,19 +3417,19 @@
 <POINTS>
 <POINT>
 <X>99</X>
-<Y>154</Y>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>150</X>
-<Y>154</Y>
+<X>158</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>150</X>
-<Y>146</Y>
+<X>158</X>
+<Y>154</Y>
 </POINT>
 <POINT>
 <X>99</X>
-<Y>146</Y>
+<Y>154</Y>
 </POINT>
 </POINTS>
 </RELC>
@@ -3250,14 +3445,14 @@
 <POINTS>
 <POINT>
 <X>194</X>
-<Y>146</Y>
+<Y>154</Y>
 </POINT>
 <POINT>
-<X>154</X>
-<Y>146</Y>
+<X>158</X>
+<Y>154</Y>
 </POINT>
 <POINT>
-<X>154</X>
+<X>158</X>
 <Y>162</Y>
 </POINT>
 <POINT>
@@ -3277,19 +3472,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>204</X>
-<Y>154</Y>
+<X>99</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>158</X>
-<Y>154</Y>
+<X>161</X>
+<Y>162</Y>
 </POINT>
 <POINT>
-<X>158</X>
+<X>161</X>
 <Y>162</Y>
 </POINT>
 <POINT>
-<X>210</X>
+<X>99</X>
 <Y>162</Y>
 </POINT>
 </POINTS>
@@ -3305,11 +3500,11 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>368</X>
-<Y>63</Y>
+<X>450</X>
+<Y>78</Y>
 </POINT>
 <POINT>
-<X>368</X>
+<X>450</X>
 <Y>91</Y>
 </POINT>
 <POINT>
@@ -3369,11 +3564,11 @@
 <Y>279</Y>
 </POINT>
 <POINT>
-<X>293</X>
+<X>327</X>
 <Y>279</Y>
 </POINT>
 <POINT>
-<X>293</X>
+<X>327</X>
 <Y>329</Y>
 </POINT>
 </POINTS>
@@ -3389,19 +3584,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>319</X>
-<Y>438</Y>
+<X>364</X>
+<Y>453</Y>
 </POINT>
 <POINT>
-<X>319</X>
+<X>364</X>
 <Y>487</Y>
 </POINT>
 <POINT>
-<X>754</X>
+<X>808</X>
 <Y>487</Y>
 </POINT>
 <POINT>
-<X>754</X>
+<X>808</X>
 <Y>539</Y>
 </POINT>
 </POINTS>
@@ -3417,19 +3612,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>368</X>
-<Y>63</Y>
+<X>450</X>
+<Y>78</Y>
 </POINT>
 <POINT>
-<X>368</X>
+<X>450</X>
 <Y>89</Y>
 </POINT>
 <POINT>
-<X>801</X>
+<X>883</X>
 <Y>89</Y>
 </POINT>
 <POINT>
-<X>801</X>
+<X>883</X>
 <Y>539</Y>
 </POINT>
 </POINTS>
@@ -3446,7 +3641,7 @@
 <POINTS>
 <POINT>
 <X>72</X>
-<Y>438</Y>
+<Y>423</Y>
 </POINT>
 <POINT>
 <X>72</X>
@@ -3473,11 +3668,11 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>285</X>
-<Y>438</Y>
+<X>315</X>
+<Y>453</Y>
 </POINT>
 <POINT>
-<X>285</X>
+<X>315</X>
 <Y>489</Y>
 </POINT>
 <POINT>
@@ -3529,16 +3724,16 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>736</X>
-<Y>663</Y>
+<X>781</X>
+<Y>693</Y>
 </POINT>
 <POINT>
-<X>736</X>
-<Y>681</Y>
+<X>781</X>
+<Y>706</Y>
 </POINT>
 <POINT>
 <X>382</X>
-<Y>681</Y>
+<Y>706</Y>
 </POINT>
 <POINT>
 <X>382</X>
@@ -3613,20 +3808,20 @@
 <TORELATIVEY>5806</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>376</X>
-<Y>384</Y>
+<X>444</X>
+<Y>392</Y>
 </POINT>
 <POINT>
-<X>443</X>
-<Y>384</Y>
+<X>507</X>
+<Y>392</Y>
 </POINT>
 <POINT>
-<X>443</X>
-<Y>384</Y>
+<X>507</X>
+<Y>393</Y>
 </POINT>
 <POINT>
 <X>569</X>
-<Y>384</Y>
+<Y>393</Y>
 </POINT>
 </POINTS>
 </RELC>
@@ -3649,11 +3844,11 @@
 <Y>301</Y>
 </POINT>
 <POINT>
-<X>608</X>
+<X>610</X>
 <Y>301</Y>
 </POINT>
 <POINT>
-<X>608</X>
+<X>610</X>
 <Y>243</Y>
 </POINT>
 </POINTS>
@@ -3669,19 +3864,19 @@
 <TORELATIVEY>5000</TORELATIVEY>
 <POINTS>
 <POINT>
-<X>337</X>
+<X>389</X>
 <Y>329</Y>
 </POINT>
 <POINT>
-<X>337</X>
+<X>389</X>
 <Y>301</Y>
 </POINT>
 <POINT>
-<X>561</X>
+<X>562</X>
 <Y>301</Y>
 </POINT>
 <POINT>
-<X>561</X>
+<X>562</X>
 <Y>243</Y>
 </POINT>
 </POINTS>
diff --git a/screening/source/sql/postgresql/_ERD/schema.png b/screening/source/sql/postgresql/_ERD/schema.png
index 9594f791ab7d0fbfa7fcf8a2151782336da9262c..57fffd03e9dfcd78644a21e8b805d6b0538ffe69 100644
Binary files a/screening/source/sql/postgresql/_ERD/schema.png and b/screening/source/sql/postgresql/_ERD/schema.png differ
diff --git a/screening/source/sql/postgresql/_ERD/version.txt b/screening/source/sql/postgresql/_ERD/version.txt
index 285d0d9c8d4486577cef81e8d120fc72382bd74a..c99e688b1be69133d9d191241f9a25d4e11b00c3 100644
--- a/screening/source/sql/postgresql/_ERD/version.txt
+++ b/screening/source/sql/postgresql/_ERD/version.txt
@@ -1 +1 @@
-Last update: v005
\ No newline at end of file
+Last update: v008, 26.11.2010
\ No newline at end of file