diff --git a/setup/data/100.contactobject.xml b/setup/data/100.contactobject.xml
new file mode 100644
index 000000000..e26cac46a
--- /dev/null
+++ b/setup/data/100.contactobject.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkContactRealObject id="1">
+<contact_id>8</contact_id>
+<object_id>6</object_id>
+<role>business model expert</role>
+</lnkContactRealObject>
+<lnkContactRealObject id="2">
+<contact_id>4</contact_id>
+<object_id>9</object_id>
+<role>owner</role>
+</lnkContactRealObject>
+<lnkContactRealObject id="3">
+<contact_id>6</contact_id>
+<object_id>107</object_id>
+<role>Server Owner</role>
+</lnkContactRealObject>
+<lnkContactRealObject id="4">
+<contact_id>8</contact_id>
+<object_id>4</object_id>
+<role>Team Leader</role>
+</lnkContactRealObject>
+</Set>
\ No newline at end of file
diff --git a/setup/data/101.infragroup.xml b/setup/data/101.infragroup.xml
new file mode 100644
index 000000000..31ef04e97
--- /dev/null
+++ b/setup/data/101.infragroup.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkInfraGrouping id="1">
+<infra_id>107</infra_id>
+<infra_group_id>326</infra_group_id>
+<impact>monitored</impact>
+</lnkInfraGrouping>
+<lnkInfraGrouping id="2">
+<infra_id>306</infra_id>
+<infra_group_id>326</infra_group_id>
+<impact>monitoring server</impact>
+</lnkInfraGrouping>
+</Set>
\ No newline at end of file
diff --git a/setup/data/11.1.servicecall.xml b/setup/data/11.1.servicecall.xml
new file mode 100644
index 000000000..7a4361f6f
--- /dev/null
+++ b/setup/data/11.1.servicecall.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<bizServiceCall id="1">
+<name>S-000001</name>
+<title>new call</title>
+<type>Desktop</type>
+<org_id>2</org_id>
+<call_status>Closed</call_status>
+<call_description>gsgwg
+wrgwerg
+wrgtwer
+gt</call_description>
+<creation_date>2009-09-18 10:21:00</creation_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>2009-09-22 21:34:35</end_date>
+<caller_id>5</caller_id>
+<impact>issue</impact>
+<workgroup_id>317</workgroup_id>
+<agent_id>6</agent_id>
+<action_log>et blabla</action_log>
+<severity>low</severity>
+<resolution>et zouzou</resolution>
+<source>phone</source>
+</bizServiceCall>
+<bizServiceCall id="4">
+<name>S-000004</name>
+<title>Need a new PC</title>
+<type>Desktop</type>
+<org_id>2</org_id>
+<call_status>WorkInProgress</call_status>
+<call_description>Hello
+
+i need a new laptop for working
+Could you send me a new one</call_description>
+<creation_date>2009-09-23 21:20:00</creation_date>
+<last_update>2009-09-23 21:22:09</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>6</caller_id>
+<impact>user cannot work anymore</impact>
+<workgroup_id>317</workgroup_id>
+<agent_id>327</agent_id>
+<action_log>we are looking into our store</action_log>
+<severity>low</severity>
+<resolution></resolution>
+<source>phone</source>
+</bizServiceCall>
+<bizServiceCall id="5">
+<name>S-000005</name>
+<title>Need help for iTop</title>
+<type>Server</type>
+<org_id>1</org_id>
+<call_status>New</call_status>
+<call_description>I would like a demo for iTop</call_description>
+<creation_date>2009-09-25 22:11:00</creation_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>1</caller_id>
+<impact>Not urgent</impact>
+<workgroup_id>317</workgroup_id>
+<agent_id>0</agent_id>
+<action_log></action_log>
+<severity>low</severity>
+<resolution></resolution>
+<source>phone</source>
+</bizServiceCall>
+<bizServiceCall id="6">
+<name>S-000006</name>
+<title>New service call</title>
+<type>Server</type>
+<org_id>2</org_id>
+<call_status>WorkInProgress</call_status>
+<call_description>My request</call_description>
+<creation_date>2009-09-25 23:24:00</creation_date>
+<last_update>2009-09-25 23:33:43</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>5</caller_id>
+<impact>test</impact>
+<workgroup_id>317</workgroup_id>
+<agent_id>327</agent_id>
+<action_log></action_log>
+<severity>low</severity>
+<resolution></resolution>
+<source>phone</source>
+</bizServiceCall>
+</Set>
\ No newline at end of file
diff --git a/setup/data/11.incidents.xml b/setup/data/11.incidents.xml
index e3e2db689..57ad3644c 100644
--- a/setup/data/11.incidents.xml
+++ b/setup/data/11.incidents.xml
@@ -108,29 +108,6 @@ It seems that hard disk is broken</initial_situation>
 <assignment_count>1</assignment_count>
 <resolution></resolution>
 </bizIncidentTicket>
-<bizIncidentTicket id="6">
-<name>I-000006</name>
-<title>Demo</title>
-<type>Desktop</type>
-<org_id>2</org_id>
-<ticket_status>WorkInProgress</ticket_status>
-<initial_situation>gdfgl</initial_situation>
-<current_situation></current_situation>
-<start_date>2009-03-18 22:00:00</start_date>
-<last_update>2009-09-17 18:41:44</last_update>
-<next_update>0000-00-00 00:00:00</next_update>
-<end_date>0000-00-00 00:00:00</end_date>
-<caller_id>5</caller_id>
-<impact>personne ne peut acceder au site de paris</impact>
-<workgroup_id>317</workgroup_id>
-<agent_id>6</agent_id>
-<action_log>posjgsrkg
-jgmklerjg
-gejrg</action_log>
-<severity>low</severity>
-<assignment_count>1</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
 <bizIncidentTicket id="9">
 <name>I-000009</name>
 <title>Issue on WAN</title>
diff --git a/setup/data/13.infratickets.xml b/setup/data/13.infratickets.xml
index 16f11e577..76d99ef4b 100644
--- a/setup/data/13.infratickets.xml
+++ b/setup/data/13.infratickets.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<lnkInfraTicket id="21">
-<infra_id>108</infra_id>
-<ticket_id>6</ticket_id>
-<impact>c&apos;est down</impact>
-</lnkInfraTicket>
 <lnkInfraTicket id="16">
 <infra_id>308</infra_id>
 <ticket_id>2</ticket_id>
diff --git a/setup/data/50.knownerror.xml b/setup/data/50.knownerror.xml
new file mode 100644
index 000000000..7083ca9b7
--- /dev/null
+++ b/setup/data/50.knownerror.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<bizKnownError id="1">
+<name>High CPU load</name>
+<org_id>2</org_id>
+<symptom>CPU is very high and we cannot access any more web site on this server</symptom>
+<root_cause>http daemon is hanging</root_cause>
+<workaround>stop http daemon and restart it</workaround>
+<solution></solution>
+<error_code></error_code>
+<domain>Application</domain>
+<vendor></vendor>
+<model></model>
+<version></version>
+</bizKnownError>
+</Set>
\ No newline at end of file
diff --git a/setup/data/60.group.xml b/setup/data/60.group.xml
new file mode 100644
index 000000000..2a45bfbfa
--- /dev/null
+++ b/setup/data/60.group.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<bizInfraGroup id="326">
+<name>Monitroing Nagios server1</name>
+<status>production</status>
+<org_id>2</org_id>
+<severity>low</severity>
+<type>Monitoring</type>
+<description>regroupe les CI monitorer par nagios</description>
+<parent_group_id>0</parent_group_id>
+</bizInfraGroup>
+</Set>
\ No newline at end of file
diff --git a/setup/data/99.contactteam.xml b/setup/data/99.contactteam.xml
new file mode 100644
index 000000000..2342d0987
--- /dev/null
+++ b/setup/data/99.contactteam.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<lnkContactTeam id="3">
+<contact_id>327</contact_id>
+<team_id>7</team_id>
+<role>agent</role>
+</lnkContactTeam>
+<lnkContactTeam id="4">
+<contact_id>4</contact_id>
+<team_id>8</team_id>
+<role>agent</role>
+</lnkContactTeam>
+<lnkContactTeam id="1">
+<contact_id>6</contact_id>
+<team_id>8</team_id>
+<role>team leader</role>
+</lnkContactTeam>
+<lnkContactTeam id="2">
+<contact_id>6</contact_id>
+<team_id>7</team_id>
+<role>team leader</role>
+</lnkContactTeam>
+</Set>
\ No newline at end of file
diff --git a/setup/data/export.cmd b/setup/data/export.cmd
index c30c33d04..33a1e6d2b 100644
--- a/setup/data/export.cmd
+++ b/setup/data/export.cmd
@@ -19,6 +19,7 @@ wget --output-document=09.1.interfaces.xml --post-data="auth_user=%USER%&auth_pw
 wget --output-document=09.2.circuits.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizCircuit&format=xml"
 wget --output-document=10.workgroups.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizWorkgroup&format=xml"
 wget --output-document=11.incidents.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizIncidentTicket&format=xml"
+wget --output-document=11.1.servicecall.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizServiceCall&format=xml"
 wget --output-document=12.relatedtickets.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkRelatedTicket&format=xml"
 wget --output-document=13.infratickets.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkInfraTicket&format=xml"
 wget --output-document=14.contacttickets.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkContactTicket&format=xml"
@@ -29,6 +30,17 @@ wget --output-document=18.contracts.xml --post-data="auth_user=%USER%&auth_pwd=%
 wget --output-document=18.1.services.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizService&format=xml"
 wget --output-document=19.infracontracts.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkInfraContract&format=xml"
 wget --output-document=20.contactcontracts.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkContactContract&format=xml"
+
+REM ----------- to be moved (or move the links at the end)
 wget --output-document=21.subnets.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizSubnet&format=xml"
 
+wget --output-document=50.knownerror.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizKnownError&format=xml"
+
+REM ----------- what about hierarchies?
+wget --output-document=60.group.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizInfraGroup&format=xml"
+
+wget --output-document=99.contactteam.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkContactTeam&format=xml"
+wget --output-document=100.contactobject.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkContactRealObject&format=xml"
+wget --output-document=101.infragroup.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkInfraGrouping&format=xml"
+
 pause