wlu: migrated
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932e/157932e.xml b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932e/157932e.xml
index ad355e2..4873e9f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932e/157932e.xml
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932e/157932e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uma:MethodLibrary xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3" name="157932m" briefDescription="" id="_eGh2oE2rEduWJdfZ9gn6JQ" orderingGuide="" suppressed="false" authors="" changeDescription="" version="" tool="epf=1.0.0">
+<uma:MethodLibrary xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3" name="157932m" briefDescription="" id="_eGh2oE2rEduWJdfZ9gn6JQ" orderingGuide="" suppressed="false" authors="" changeDescription="" version="" tool="epf=1.2.0">
   <MethodPlugin name="new_plug-in" briefDescription="" id="_f48PcE2rEduWJdfZ9gn6JQ" orderingGuide="" suppressed="false" authors="" changeDescription="" version="" userChangeable="true">
     <MethodPackage xsi:type="uma:ContentCategoryPackage" name="ContentCategories" id="_kEpa4E2rEduWJdfZ9gn6JQ"/>
   </MethodPlugin>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/.project b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/.project
new file mode 100644
index 0000000..2d39a8e
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/.project
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>157932golden</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.epf.library.project.MethodLibraryProjectNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/library.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/library.xmi
index ec2d5e5..5fcb9e8 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/library.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/library.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_poZXUE2rEduiG53NqvE4Hg" guid="_poZXUE2rEduiG53NqvE4Hg">
     <subManagers xmi:id="_qbfoME2rEduiG53NqvE4Hg" href="uma://_qbZhkE2rEduiG53NqvE4Hg#_qbfoME2rEduiG53NqvE4Hg"/>
     <subManagers xmi:id="_20SJ0E2rEduw0OulMb2J2w" href="uma://_f48PcE2rEduWJdfZ9gn6JQ#_20SJ0E2rEduw0OulMb2J2w"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in/plugin.xmi
index 03cf6da..ea9f981 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_20SJ0E2rEduw0OulMb2J2w" guid="_20SJ0E2rEduw0OulMb2J2w"/>
   <org.eclipse.epf.uma:MethodPlugin xmi:id="_f48PcE2rEduWJdfZ9gn6JQ" name="new_plug-in" guid="_f48PcE2rEduWJdfZ9gn6JQ">
     <methodPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_2z5vUE2rEduw0OulMb2J2w" name="Content" guid="_2z5vUE2rEduw0OulMb2J2w">
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in_renamed/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in_renamed/plugin.xmi
index 083065f..53860cb 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in_renamed/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932golden/new_plug-in_renamed/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_qbfoME2rEduiG53NqvE4Hg" guid="_qbfoME2rEduiG53NqvE4Hg"/>
   <org.eclipse.epf.uma:MethodPlugin xmi:id="_qbZhkE2rEduiG53NqvE4Hg" name="new_plug-in_renamed" guid="_qbZhkE2rEduiG53NqvE4Hg">
     <methodPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_qbZhkU2rEduiG53NqvE4Hg" name="Content" guid="_qbZhkU2rEduiG53NqvE4Hg">
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/.project b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/.project
new file mode 100644
index 0000000..c722e4a
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/.project
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>157932m</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.epf.library.project.MethodLibraryProjectNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/library.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/library.xmi
index 4b9a5b8..c3f469b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/library.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/library.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_poZXUE2rEduiG53NqvE4Hg" guid="_poZXUE2rEduiG53NqvE4Hg">
     <subManagers xmi:id="_qbfoME2rEduiG53NqvE4Hg" href="uma://_qbZhkE2rEduiG53NqvE4Hg#_qbfoME2rEduiG53NqvE4Hg"/>
     <resourceDescriptors xmi:id="_polkkE2rEduiG53NqvE4Hg" id="_poTQsE2rEduiG53NqvE4Hg" uri=""/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/new_plug-in/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/new_plug-in/plugin.xmi
index 4178594..be6b57b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/new_plug-in/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/157932/157932m/new_plug-in/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_qbfoME2rEduiG53NqvE4Hg" guid="_qbfoME2rEduiG53NqvE4Hg"/>
   <org.eclipse.epf.uma:MethodPlugin xmi:id="_qbZhkE2rEduiG53NqvE4Hg" name="new_plug-in" guid="_qbZhkE2rEduiG53NqvE4Hg">
     <methodPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_qbZhkU2rEduiG53NqvE4Hg" name="Content" guid="_qbZhkU2rEduiG53NqvE4Hg">
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925e/158913n158925e.xml b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925e/158913n158925e.xml
index 9b06c78..c3e6ce3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925e/158913n158925e.xml
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925e/158913n158925e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uma:MethodLibrary xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3" name="158913n158925m" briefDescription="" id="_8ygz0E5QEduGkqWGzwpn7Q" orderingGuide="" suppressed="false" authors="" changeDescription="" version="" tool="epf=1.0.0">
+<uma:MethodLibrary xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uma="http://www.eclipse.org/epf/uma/1.0.3" name="158913n158925m" briefDescription="" id="_8ygz0E5QEduGkqWGzwpn7Q" orderingGuide="" suppressed="false" authors="" changeDescription="" version="" tool="epf=1.2.0">
   <MethodPlugin name="new_plug-in" briefDescription="" id="_-PDDQE5QEduGkqWGzwpn7Q" orderingGuide="" suppressed="false" authors="" changeDescription="" version="" userChangeable="true">
     <MethodPackage xsi:type="uma:ContentCategoryPackage" name="ContentCategories" id="_GT64oE5REduGkqWGzwpn7Q"/>
     <MethodPackage xsi:type="uma:ContentPackage" name="new_content_package" briefDescription="" id="_D1fHUE5REduGkqWGzwpn7Q" orderingGuide="" suppressed="false" global="false"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/.project b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/.project
new file mode 100644
index 0000000..6f8d76c
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/.project
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>158913n158925golden</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.epf.library.project.MethodLibraryProjectNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/configurations/c.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/configurations/c.xmi
index d5d6fc8..aa1320f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/configurations/c.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/configurations/c.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="_AgBnYE5REduGkqWGzwpn7Q" name="c" guid="_AgBnYE5REduGkqWGzwpn7Q">
+<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="_AgBnYE5REduGkqWGzwpn7Q" name="c" guid="_AgBnYE5REduGkqWGzwpn7Q">
   <methodPluginSelection href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PDDQE5QEduGkqWGzwpn7Q"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PDDTU5QEduGkqWGzwpn7Q"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PDDQU5QEduGkqWGzwpn7Q"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/library.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/library.xmi
index 25ff577..fff5f06 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/library.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/library.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_8zFbkE5QEduGkqWGzwpn7Q" guid="_8zFbkE5QEduGkqWGzwpn7Q">
     <subManagers xmi:id="_-PJJ4U5QEduGkqWGzwpn7Q" href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PJJ4U5QEduGkqWGzwpn7Q"/>
     <resourceDescriptors xmi:id="_8zRo0E5QEduGkqWGzwpn7Q" id="_8ygz0E5QEduGkqWGzwpn7Q" uri=""/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/content.xmi
index 1bdd422..ff7febd 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-t72JwbqvK9u4stj31bqCog" name="cp,_CeL9MU5REduGkqWGzwpn7Q" guid="-t72JwbqvK9u4stj31bqCog"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-t72JwbqvK9u4stj31bqCog" name="cp,_CeL9MU5REduGkqWGzwpn7Q" guid="-t72JwbqvK9u4stj31bqCog"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/model.xmi
index d036749..ce79766 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_nq7goU5REduOopq5TevYaw" guid="_nq7goU5REduOopq5TevYaw">
     <resourceDescriptors xmi:id="_nq7gok5REduOopq5TevYaw" id="-t72JwbqvK9u4stj31bqCog" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/content.xmi
index bba969e..9c007b3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-vBdfuik5ujhJeVKyzV7_YA" name="cp,_LbsqwU5REduGkqWGzwpn7Q" guid="-vBdfuik5ujhJeVKyzV7_YA"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-vBdfuik5ujhJeVKyzV7_YA" name="cp,_LbsqwU5REduGkqWGzwpn7Q" guid="-vBdfuik5ujhJeVKyzV7_YA"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/model.xmi
index 0c48328..4f3493b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/capabilitypatterns/cp_renamed/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_LcRSgU5REduGkqWGzwpn7Q" guid="_LcRSgU5REduGkqWGzwpn7Q">
     <resourceDescriptors xmi:id="_LcRSgk5REduGkqWGzwpn7Q" id="-vBdfuik5ujhJeVKyzV7_YA" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/plugin.xmi
index 4aa34f7..de0ae74 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925golden/new_plug-in/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_-PJJ4U5QEduGkqWGzwpn7Q" guid="_-PJJ4U5QEduGkqWGzwpn7Q">
     <subManagers xmi:id="_LcRSgU5REduGkqWGzwpn7Q" href="uma://_LbsqwE5REduGkqWGzwpn7Q#_LcRSgU5REduGkqWGzwpn7Q"/>
     <subManagers xmi:id="_nq7goU5REduOopq5TevYaw" href="uma://_CeL9ME5REduGkqWGzwpn7Q#_nq7goU5REduOopq5TevYaw"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/.project b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/.project
new file mode 100644
index 0000000..47a232c
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/.project
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>158913n158925m</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.epf.library.project.MethodLibraryProjectNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/configurations/c.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/configurations/c.xmi
index 312cd21..400ac82 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/configurations/c.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/configurations/c.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="_AgBnYE5REduGkqWGzwpn7Q" name="c" guid="_AgBnYE5REduGkqWGzwpn7Q">
+<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="_AgBnYE5REduGkqWGzwpn7Q" name="c" guid="_AgBnYE5REduGkqWGzwpn7Q">
   <methodPluginSelection href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PDDQE5QEduGkqWGzwpn7Q"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PDDTU5QEduGkqWGzwpn7Q"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PDDQU5QEduGkqWGzwpn7Q"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/library.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/library.xmi
index 25ff577..fff5f06 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/library.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/library.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_8zFbkE5QEduGkqWGzwpn7Q" guid="_8zFbkE5QEduGkqWGzwpn7Q">
     <subManagers xmi:id="_-PJJ4U5QEduGkqWGzwpn7Q" href="uma://_-PDDQE5QEduGkqWGzwpn7Q#_-PJJ4U5QEduGkqWGzwpn7Q"/>
     <resourceDescriptors xmi:id="_8zRo0E5QEduGkqWGzwpn7Q" id="_8ygz0E5QEduGkqWGzwpn7Q" uri=""/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/content.xmi
index bba969e..9c007b3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-vBdfuik5ujhJeVKyzV7_YA" name="cp,_LbsqwU5REduGkqWGzwpn7Q" guid="-vBdfuik5ujhJeVKyzV7_YA"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-vBdfuik5ujhJeVKyzV7_YA" name="cp,_LbsqwU5REduGkqWGzwpn7Q" guid="-vBdfuik5ujhJeVKyzV7_YA"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/model.xmi
index 93374f7..44ad68c 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/capabilitypatterns/cp/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_LcRSgU5REduGkqWGzwpn7Q" guid="_LcRSgU5REduGkqWGzwpn7Q">
     <resourceDescriptors xmi:id="_LcRSgk5REduGkqWGzwpn7Q" id="-vBdfuik5ujhJeVKyzV7_YA" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/plugin.xmi
index 5836058..9a3fded 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Bugs_1/158913n158925/158913n158925m/new_plug-in/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_-PJJ4U5QEduGkqWGzwpn7Q" guid="_-PJJ4U5QEduGkqWGzwpn7Q">
     <subManagers xmi:id="_LcRSgU5REduGkqWGzwpn7Q" href="uma://_LbsqwE5REduGkqWGzwpn7Q#_LcRSgU5REduGkqWGzwpn7Q"/>
     <resourceDescriptors xmi:id="_LbyxYU5REduGkqWGzwpn7Q" id="_LbsqwE5REduGkqWGzwpn7Q" uri="capabilitypatterns/cp/model.xmi"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/.project b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/.project
new file mode 100644
index 0000000..c5db01a
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/.project
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Paris</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.epf.library.project.MethodLibraryProjectNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/content.xmi
index fc52f8f..13d8bfe 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-98WTWurBMSiEhhZFIsykkA" name="CP A1,_dBhvkUAvEdqFqIu8-ckolg" guid="-98WTWurBMSiEhhZFIsykkA"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-98WTWurBMSiEhhZFIsykkA" name="CP A1,_dBhvkUAvEdqFqIu8-ckolg" guid="-98WTWurBMSiEhhZFIsykkA"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/diagram.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/diagram.xmi
new file mode 100644
index 0000000..4416db0
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/diagram.xmi
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:org.eclipse.epf.diagram.model="http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore">
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IcUjQOx4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:CapabilityPattern" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_dBhvkUAvEdqFqIu8-ckolg"/>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IcUjQex4Edu2Oo6q-nHWgg" type="ADD" element="_IcUjQOx4Edu2Oo6q-nHWgg" name="CP A1" measurementUnit="Pixel">
+    <styles xmi:type="notation:PageStyle" xmi:id="_IcUjQux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IcUjQ-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IcUjROx4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_Icm3Oex4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_eaCaoEAvEdqFqIu8-ckolg"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_Icm3Oux4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7UsUAvEdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_Icm3O-x4Edu2Oo6q-nHWgg" name="Role A1">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7UsUAvEdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_Icm3POx4Edu2Oo6q-nHWgg" incomingConnections="_Icm3P-x4Edu2Oo6q-nHWgg" name="Task A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7UsEAvEdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3Pex4Edu2Oo6q-nHWgg" target="_Icm3Qux4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3Pux4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7UsEAvEdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3P-x4Edu2Oo6q-nHWgg" target="_Icm3POx4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3QOx4Edu2Oo6q-nHWgg" name="Sub_Artifact A1.1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7Us0AvEdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3Qex4Edu2Oo6q-nHWgg" name="Artifact A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gGEeoEAvEdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3Qux4Edu2Oo6q-nHWgg" incomingConnections="_Icm3Pex4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7UsEAvEdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3Q-x4Edu2Oo6q-nHWgg" name="Outcome A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gGEeokAvEdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_Icm3ROx4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jvSBAEAvEdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_Icm3Rex4Edu2Oo6q-nHWgg" name="Role B1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jvSBAEAvEdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_Icm3Rux4Edu2Oo6q-nHWgg" incomingConnections="_Icm3Sex4Edu2Oo6q-nHWgg" name="Task B1 presnet">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jBFeQEAvEdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3R-x4Edu2Oo6q-nHWgg" target="_Icm3S-x4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3SOx4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jBFeQEAvEdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3Sex4Edu2Oo6q-nHWgg" target="_Icm3Rux4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3Sux4Edu2Oo6q-nHWgg" name="Artifact B1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jvSBAkAvEdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3S-x4Edu2Oo6q-nHWgg" incomingConnections="_Icm3R-x4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jBFeQEAvEdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3TOx4Edu2Oo6q-nHWgg" name="Outcome B1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jvSBBEAvEdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_Icm3Tex4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jvSBAUAvEdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_Icm3Tux4Edu2Oo6q-nHWgg" name="Role B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_jvSBAUAvEdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_Icm3T-x4Edu2Oo6q-nHWgg" incomingConnections="_Icm3Uux4Edu2Oo6q-nHWgg" name="Task B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_kYjngEAvEdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3UOx4Edu2Oo6q-nHWgg" target="_Icm3VOx4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3Uex4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_kYjngEAvEdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3Uux4Edu2Oo6q-nHWgg" target="_Icm3T-x4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3U-x4Edu2Oo6q-nHWgg" name="Artifact B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_kY_sYEAvEdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3VOx4Edu2Oo6q-nHWgg" incomingConnections="_Icm3UOx4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_kYjngEAvEdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3Vex4Edu2Oo6q-nHWgg" name="Outcome B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_kY_sYkAvEdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_Icm3Vux4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_gF7UskAvEdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3V-x4Edu2Oo6q-nHWgg" incomingConnections="_Icm3WOx4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_a0gkwEA3EdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Icm3WOx4Edu2Oo6q-nHWgg" target="_Icm3V-x4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3Wex4Edu2Oo6q-nHWgg" name="Artifact A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_a1teoEA3EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Icm3Wux4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_a0gkwEA3EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Icm3W-x4Edu2Oo6q-nHWgg" name="Outcome A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_dBhvkEAvEdqFqIu8-ckolg#_a3MsYEA3EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_Icm3XOx4Edu2Oo6q-nHWgg" type="ADD" element="_Icm3Oex4Edu2Oo6q-nHWgg" name="Act1" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_Icm3YOx4Edu2Oo6q-nHWgg" type="1001" element="_Icm3Oux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Icm3Yex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3Yux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Icm3Y-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Icm3ZOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Icm3Zux4Edu2Oo6q-nHWgg" x="20" y="169" width="158" height="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Icm3Z-x4Edu2Oo6q-nHWgg" type="1002" element="_Icm3Pux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Icm3aOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3aex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Icm3aux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Icm3a-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Icm3bex4Edu2Oo6q-nHWgg" x="86" y="1" width="84" height="148"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Icm3bux4Edu2Oo6q-nHWgg" type="1002" element="_Icm3Qux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Icm3b-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3cOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Icm3cex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Icm3cux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Icm3dOx4Edu2Oo6q-nHWgg" x="91" y="242" width="74" height="111"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Icm3dex4Edu2Oo6q-nHWgg" type="1001" element="_Icm3ROx4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Icm3dux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3d-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Icm3eOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Icm3eex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Icm3e-x4Edu2Oo6q-nHWgg" x="20" y="793" width="196" height="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Icm3fOx4Edu2Oo6q-nHWgg" type="1002" element="_Icm3SOx4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Icm3fex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3fux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Icm3f-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Icm3gOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Icm3gux4Edu2Oo6q-nHWgg" x="130" y="706" width="73" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Icm3g-x4Edu2Oo6q-nHWgg" type="1002" element="_Icm3S-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Icm3hOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3hex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Icm3hux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Icm3h-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics9wOx4Edu2Oo6q-nHWgg" x="130" y="866" width="73" height="111"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ics9wex4Edu2Oo6q-nHWgg" type="1001" element="_Icm3Tex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ics9wux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ics9w-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ics9xOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ics9xex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics9x-x4Edu2Oo6q-nHWgg" x="20" y="1105" width="196" height="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ics9yOx4Edu2Oo6q-nHWgg" type="1002" element="_Icm3Uex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ics9yex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ics9yux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ics9y-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ics9zOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics9zux4Edu2Oo6q-nHWgg" x="130" y="1018" width="73" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ics9z-x4Edu2Oo6q-nHWgg" type="1002" element="_Icm3VOx4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ics90Ox4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ics90ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ics90ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ics90-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics91ex4Edu2Oo6q-nHWgg" x="130" y="1178" width="73" height="111"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ics91ux4Edu2Oo6q-nHWgg" type="1001" element="_Icm3Vux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ics91-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ics92Ox4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ics92ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ics92ux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics93Ox4Edu2Oo6q-nHWgg" x="20" y="481" width="124" height="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ics93ex4Edu2Oo6q-nHWgg" type="1002" element="_Icm3V-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ics93ux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ics93-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ics94Ox4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ics94ex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics94-x4Edu2Oo6q-nHWgg" x="76" y="394" width="74" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ics95Ox4Edu2Oo6q-nHWgg" type="1002" element="_Icm3Wux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ics95ex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ics95ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ics95-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ics96Ox4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ics96ux4Edu2Oo6q-nHWgg" x="76" y="554" width="74" height="111"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_Icm3Xex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_Icm3Xux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_Icm3X-x4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/model.xmi
index 82f42f7..18e2ad6 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP A1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_dF2O4EAvEdqFqIu8-ckolg" guid="_dF2O4EAvEdqFqIu8-ckolg">
     <resourceDescriptors xmi:id="_dF2O4UAvEdqFqIu8-ckolg" id="-98WTWurBMSiEhhZFIsykkA" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git "a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/content.xmi" "b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/content.xmi"
index a3546d1..c273331 100644
--- "a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/content.xmi"
+++ "b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/content.xmi"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-bq00o8v12DXUVFtCniJNcg" name="CapPat A1,_aHUSQRBNEdqBs7KhdVLRLA" guid="-bq00o8v12DXUVFtCniJNcg">
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-bq00o8v12DXUVFtCniJNcg" name="CapPat A1,_aHUSQRBNEdqBs7KhdVLRLA" guid="-bq00o8v12DXUVFtCniJNcg">
   <mainDescription>CP extending 'CP1 with all elements' main</mainDescription>
   <keyConsiderations>CP extending 'CP1 with all elements' key con</keyConsiderations>
   <purpose>&lt;p&gt;
diff --git "a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/diagram.xmi" "b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/diagram.xmi"
new file mode 100644
index 0000000..e520ca1
--- /dev/null
+++ "b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/diagram.xmi"
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:org.eclipse.epf.diagram.model="http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore">
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IcOcoOx4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:CapabilityPattern" href="uma://_aHUSQBBNEdqBs7KhdVLRLA#_aHUSQRBNEdqBs7KhdVLRLA"/>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IcOcoex4Edu2Oo6q-nHWgg" type="ADD" element="_IcOcoOx4Edu2Oo6q-nHWgg" name="CP extending 'CP1 with all elements'" measurementUnit="Pixel">
+    <styles xmi:type="notation:PageStyle" xmi:id="_IcOcoux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IcOco-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IcOcpOx4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git "a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/model.xmi" "b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/model.xmi"
index bf4a86d..c062251 100644
--- "a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/model.xmi"
+++ "b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP extending \047CP1 with all elements\047/model.xmi"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_cnWmEBBNEdqBs7KhdVLRLA" guid="_cnWmEBBNEdqBs7KhdVLRLA">
     <resourceDescriptors xmi:id="_cnWmERBNEdqBs7KhdVLRLA" id="-bq00o8v12DXUVFtCniJNcg" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/content.xmi
index 859fb00..7fefad3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/content.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma:ProcessDescription xmi:id="-E-d4Jcu297rxUq8lte8qnw" name="CP1 with all elements,_4sCtsTzgEdq5ysFONr1BGQ" guid="-E-d4Jcu297rxUq8lte8qnw">
     <mainDescription>&lt;p&gt;
     The subcategories of process are delivery process and capability pattern.&amp;nbsp; A delivery process defines a complete
@@ -39,8 +39,7 @@
     satisfy the requirements on the system. If the system includes a database, then &lt;a href=&quot;resources/wfs_and7.htm&quot;&gt;&lt;font
     color=&quot;#0000ff&quot;&gt;Design the Database&lt;/font&gt;&lt;/a&gt; occurs in parallel. The result is an initial set of components which are
     further refined in &lt;a href=&quot;resources/wfd_imp.htm&quot;&gt;&lt;font color=&quot;#0000ff&quot;&gt;Implementation&lt;/font&gt;&lt;/a&gt;.&lt;br /&gt;
-&lt;/p&gt;
-&amp;nbsp;&lt;br /&gt;
+&lt;/p&gt;&amp;nbsp;&lt;br /&gt;
 &lt;br /&gt;</alternatives>
     <howtoStaff>&lt;p&gt;
     To explain the work involved in the Analysis and Design discipline, the activities and work products are organized into
@@ -98,8 +97,7 @@
     satisfy the requirements on the system. If the system includes a database, then &lt;a href=&quot;resources/wfs_and7.htm&quot;&gt;&lt;font
     color=&quot;#0000ff&quot;&gt;Design the Database&lt;/font&gt;&lt;/a&gt; occurs in parallel. The result is an initial set of components which are
     further refined in &lt;a href=&quot;resources/wfd_imp.htm&quot;&gt;&lt;font color=&quot;#0000ff&quot;&gt;Implementation&lt;/font&gt;&lt;/a&gt;.&lt;br /&gt;
-&lt;/p&gt;
-&amp;nbsp;&lt;br /&gt;
+&lt;/p&gt;&amp;nbsp;&lt;br /&gt;
 &lt;br /&gt;</scope>
     <usageNotes>&lt;p&gt;
     The subcategories of process are delivery process and capability pattern.&amp;nbsp; A delivery process defines a complete
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/diagram.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/diagram.xmi
new file mode 100644
index 0000000..ab58cdb
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/diagram.xmi
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:org.eclipse.epf.diagram.model="http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore">
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IHgJ0Ox4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:CapabilityPattern" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_4sCtsTzgEdq5ysFONr1BGQ"/>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IHgJ0ex4Edu2Oo6q-nHWgg" type="ADD" element="_IHgJ0Ox4Edu2Oo6q-nHWgg" name="CP1 with all elements" measurementUnit="Pixel">
+    <styles xmi:type="notation:PageStyle" xmi:id="_IHgJ0ux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IHgJ0-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IHgJ1Ox4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IHsXEOx4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Phase" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_DakQcDziEdq5ysFONr1BGQ"/>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IHsXEex4Edu2Oo6q-nHWgg" type="ADD" element="_IHsXEOx4Edu2Oo6q-nHWgg" name="Phase1" measurementUnit="Pixel">
+    <styles xmi:type="notation:PageStyle" xmi:id="_IHsXEux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IHsXE-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IHsXFOx4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IHsXFex4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Iteration" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_EFVrwTziEdq5ysFONr1BGQ"/>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IHsXFux4Edu2Oo6q-nHWgg" type="ADD" element="_IHsXFex4Edu2Oo6q-nHWgg" name="Iteration1" measurementUnit="Pixel">
+    <styles xmi:type="notation:PageStyle" xmi:id="_IHsXF-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IHsXGOx4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IHsXGex4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IMFu6ex4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_E73rITziEdq5ysFONr1BGQ"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IMFu6ux4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_P1sUYDziEdq5ysFONr1BGQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_IMFu6-x4Edu2Oo6q-nHWgg" name="roleDesc1">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_P1sUYDziEdq5ysFONr1BGQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_IMFu7Ox4Edu2Oo6q-nHWgg" incomingConnections="_IMFu7-x4Edu2Oo6q-nHWgg" name="Task_Linked_To_TaskA1">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_FrtMoDziEdq5ysFONr1BGQ"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IMFu7ex4Edu2Oo6q-nHWgg" target="_IMFu8ex4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IMFu7ux4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_FrtMoDziEdq5ysFONr1BGQ"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IMFu7-x4Edu2Oo6q-nHWgg" target="_IMFu7Ox4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IMFu8Ox4Edu2Oo6q-nHWgg" name="wpDesc1 is linked to artifact">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_SUGQgDziEdq5ysFONr1BGQ"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IMFu8ex4Edu2Oo6q-nHWgg" incomingConnections="_IMFu7ex4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_FrtMoDziEdq5ysFONr1BGQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IMFu8ux4Edu2Oo6q-nHWgg" name="wpDesc2 linked to deliverable">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_TCu4IDziEdq5ysFONr1BGQ"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IMFu8-x4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_Q99kADziEdq5ysFONr1BGQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_IMFu9Ox4Edu2Oo6q-nHWgg" name="roleDesc2">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_Q99kADziEdq5ysFONr1BGQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_IMFu9ex4Edu2Oo6q-nHWgg" incomingConnections="_IMFu-Ox4Edu2Oo6q-nHWgg" name="Task_Linked_To_taskA2">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_LwLQgDziEdq5ysFONr1BGQ"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IMFu9ux4Edu2Oo6q-nHWgg" target="_IMFu-ux4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IMFu9-x4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_LwLQgDziEdq5ysFONr1BGQ"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IMFu-Ox4Edu2Oo6q-nHWgg" target="_IMFu9ex4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IMFu-ex4Edu2Oo6q-nHWgg" name="wpDesc2 linked to deliverable">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_TCu4IDziEdq5ysFONr1BGQ"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IMFu-ux4Edu2Oo6q-nHWgg" incomingConnections="_IMFu9ux4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_LwLQgDziEdq5ysFONr1BGQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IMFu--x4Edu2Oo6q-nHWgg" name="wpDesc1 is linked to artifact">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_SUGQgDziEdq5ysFONr1BGQ"/>
+      </nodes>
+    </nodes>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IMFu_Ox4Edu2Oo6q-nHWgg" type="ADD" element="_IMFu6ex4Edu2Oo6q-nHWgg" name="Activity1" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_IUZWUOx4Edu2Oo6q-nHWgg" type="1001" element="_IMFu6ux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IUZWUex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IUZWUux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IUZWU-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IUZWVOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVEEsOx4Edu2Oo6q-nHWgg" x="10" y="186"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVQR8Ox4Edu2Oo6q-nHWgg" type="1002" element="_IMFu7ux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVQR8ex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVQR8ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVQR8-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVQR9Ox4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVQR9ux4Edu2Oo6q-nHWgg" x="-12" y="49" width="151"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVWYkOx4Edu2Oo6q-nHWgg" type="1002" element="_IMFu8ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVWYkex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVWYkux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVWYk-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVWYlOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVWYlux4Edu2Oo6q-nHWgg" x="69" y="297" width="96"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVWYl-x4Edu2Oo6q-nHWgg" type="1001" element="_IMFu8-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVWYmOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVWYmex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVWYmux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVWYm-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVWYnex4Edu2Oo6q-nHWgg" x="211" y="129" width="210" height="52"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVWYnux4Edu2Oo6q-nHWgg" type="1002" element="_IMFu9-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVWYn-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVWYoOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVWYoex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVWYoux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVWYpOx4Edu2Oo6q-nHWgg" x="342" y="52" width="63" height="52"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVWYpex4Edu2Oo6q-nHWgg" type="1002" element="_IMFu-ux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVWYpux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVWYp-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVWYqOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVWYqex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVWYq-x4Edu2Oo6q-nHWgg" x="274" y="255" width="154" height="52"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_IMFu_ex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IMFu_ux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IMFu_-x4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IVil2ux4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_BS6gETzlEdq5ysFONr1BGQ"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IVil2-x4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0Dk6MEDEEdqO9M3fukYA_A"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IVil3Ox4Edu2Oo6q-nHWgg" incomingConnections="_IVil3ex4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0DR_QEDEEdqO9M3fukYA_A"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IVil3ex4Edu2Oo6q-nHWgg" target="_IVil3Ox4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IVil3ux4Edu2Oo6q-nHWgg" name="Sub_Artifact A1.1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0DurMEDEEdqO9M3fukYA_A"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IVil3-x4Edu2Oo6q-nHWgg" name="Artifact A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0DurMUDEEdqO9M3fukYA_A"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IVil4Ox4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0DR_QEDEEdqO9M3fukYA_A"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IVil4ex4Edu2Oo6q-nHWgg" name="Outcome A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0DurM0DEEdqO9M3fukYA_A"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IVil4ux4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_0Dk6MUDEEdqO9M3fukYA_A"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IVil4-x4Edu2Oo6q-nHWgg" incomingConnections="_IVil5Ox4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_2887EEDEEdqO9M3fukYA_A"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IVil5Ox4Edu2Oo6q-nHWgg" target="_IVil4-x4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IVil5ex4Edu2Oo6q-nHWgg" name="Artifact A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_29ZnAEDEEdqO9M3fukYA_A"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IVil5ux4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_2887EEDEEdqO9M3fukYA_A"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IVil5-x4Edu2Oo6q-nHWgg" name="Outcome A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_4sCtsDzgEdq5ysFONr1BGQ#_29ZnAkDEEdqO9M3fukYA_A"/>
+      </nodes>
+    </nodes>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IVil6Ox4Edu2Oo6q-nHWgg" type="ADD" element="_IVil2ux4Edu2Oo6q-nHWgg" name="Activity2" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_IVil7Ox4Edu2Oo6q-nHWgg" type="1001" element="_IVil2-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVil7ex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVil7ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVil7-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVil8Ox4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVil8ux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVil8-x4Edu2Oo6q-nHWgg" type="1002" element="_IVil3Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVil9Ox4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVil9ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVil9ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVil9-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVil-ex4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVil-ux4Edu2Oo6q-nHWgg" type="1002" element="_IVil4Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVil--x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVil_Ox4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVil_ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVil_ux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVimAOx4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVimAex4Edu2Oo6q-nHWgg" type="1001" element="_IVil4ux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVimAux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVimA-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVimBOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVimBex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVimB-x4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVimCOx4Edu2Oo6q-nHWgg" type="1002" element="_IVil4-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVimCex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVimCux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVimC-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVimDOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVimDux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IVimD-x4Edu2Oo6q-nHWgg" type="1002" element="_IVil5ux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IVimEOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVimEex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IVimEux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IVimE-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IVimFex4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_IVil6ex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IVil6ux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IVil6-x4Edu2Oo6q-nHWgg"/>
+    <edges xmi:type="notation:Edge" xmi:id="_IWHNkOx4Edu2Oo6q-nHWgg" type="3001" element="_IVil3ex4Edu2Oo6q-nHWgg" source="_IVil8-x4Edu2Oo6q-nHWgg" target="_IVil8-x4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IXcqUOx4Edu2Oo6q-nHWgg" type="4004">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IXcqUex4Edu2Oo6q-nHWgg" y="40"/>
+      </children>
+      <styles xmi:type="notation:RoutingStyle" xmi:id="_IWHNkex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IWHNkux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IWHNk-x4Edu2Oo6q-nHWgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IaCEQOx4Edu2Oo6q-nHWgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Edge" xmi:id="_IaCEQex4Edu2Oo6q-nHWgg" type="3001" element="_IVil5Ox4Edu2Oo6q-nHWgg" source="_IVimCOx4Edu2Oo6q-nHWgg" target="_IVimCOx4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IaIK4Ox4Edu2Oo6q-nHWgg" type="4004">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IaIK4ex4Edu2Oo6q-nHWgg" y="40"/>
+      </children>
+      <styles xmi:type="notation:RoutingStyle" xmi:id="_IaCEQux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IaCEQ-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IaCEROx4Edu2Oo6q-nHWgg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IaIK4ux4Edu2Oo6q-nHWgg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/model.xmi
index fa248df..9cbb4b1 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP1 with all elements/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_4yc3sTzgEdq5ysFONr1BGQ" guid="_4yc3sTzgEdq5ysFONr1BGQ">
     <resourceDescriptors xmi:id="_4yc3sjzgEdq5ysFONr1BGQ" id="-E-d4Jcu297rxUq8lte8qnw" uri="content.xmi"/>
     <resourceDescriptors xmi:id="_wyDnwDziEdq5ysFONr1BGQ" id="-YVTZRE5oy5oGcue1XXh3dQ" uri="content.xmi"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/content.xmi
index d0ab592..064c4d8 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/content.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma:ProcessDescription xmi:id="-icO6pIHdZm9Vxyc-JZ9Uyw" name="CP2 containing variability elements,_ZtZbMUDFEdqO9M3fukYA_A" guid="-icO6pIHdZm9Vxyc-JZ9Uyw">
     <mainDescription>main: CP2 containing variability elements</mainDescription>
     <keyConsiderations>Keys: CP2 containing variability elements</keyConsiderations>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/diagram.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/diagram.xmi
new file mode 100644
index 0000000..82eb377
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/diagram.xmi
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:org.eclipse.epf.diagram.model="http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore">
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_Iay5Rux4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_lDhl8EDFEdqO9M3fukYA_A"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_Iay5R-x4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqX1MUDQEdqrhsZh3QNAMQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_Iay5SOx4Edu2Oo6q-nHWgg" name="Role A3 extends Role A2">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqX1MUDQEdqrhsZh3QNAMQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_Iay5Sex4Edu2Oo6q-nHWgg" incomingConnections="_Iay5TOx4Edu2Oo6q-nHWgg" name="Task A3 extends Task A2">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqX1MEDQEdqrhsZh3QNAMQ"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Iay5Sux4Edu2Oo6q-nHWgg" target="_Iay5Tux4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Iay5S-x4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqX1MEDQEdqrhsZh3QNAMQ"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Iay5TOx4Edu2Oo6q-nHWgg" target="_Iay5Sex4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Iay5Tex4Edu2Oo6q-nHWgg" name="Artifact A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqhmMkDQEdqrhsZh3QNAMQ"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Iay5Tux4Edu2Oo6q-nHWgg" incomingConnections="_Iay5Sux4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqX1MEDQEdqrhsZh3QNAMQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Iay5T-x4Edu2Oo6q-nHWgg" name="Outcome A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_GqhmNEDQEdqrhsZh3QNAMQ"/>
+      </nodes>
+    </nodes>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_Iay5UOx4Edu2Oo6q-nHWgg" type="ADD" element="_Iay5Rux4Edu2Oo6q-nHWgg" name="activity_for_variability_elements" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_Iay5VOx4Edu2Oo6q-nHWgg" type="1001" element="_Iay5R-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Iay5Vex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Iay5Vux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Iay5V-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Iay5WOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iay5Wux4Edu2Oo6q-nHWgg" x="30" y="88" width="228" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Iay5W-x4Edu2Oo6q-nHWgg" type="1002" element="_Iay5S-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Iay5XOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Iay5Xex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Iay5Xux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Iay5X-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iay5Yex4Edu2Oo6q-nHWgg" x="143" y="1" width="84" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Iay5Yux4Edu2Oo6q-nHWgg" type="1002" element="_Iay5Tux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Iay5Y-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Iay5ZOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Iay5Zex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Iay5Zux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iay5aOx4Edu2Oo6q-nHWgg" x="143" y="175" width="84" height="83"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_Iay5Uex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_Iay5Uux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_Iay5U-x4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_Ia4_4-x4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_dYGm0EDPEdqrhsZh3QNAMQ"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_Ia4_5Ox4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUAUDPEdqrhsZh3QNAMQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_Ia4_5ex4Edu2Oo6q-nHWgg" name="Role B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUAUDPEdqrhsZh3QNAMQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_Ia4_5ux4Edu2Oo6q-nHWgg" incomingConnections="_Ia4_6ex4Edu2Oo6q-nHWgg" name="Task B2 extends Task A1">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUAEDPEdqrhsZh3QNAMQ"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Ia4_5-x4Edu2Oo6q-nHWgg" target="_Ia4_7ex4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Ia4_6Ox4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUAEDPEdqrhsZh3QNAMQ"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_Ia4_6ex4Edu2Oo6q-nHWgg" target="_Ia4_5ux4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Ia4_6ux4Edu2Oo6q-nHWgg" name="Artifact B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUBEDPEdqrhsZh3QNAMQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Ia4_6-x4Edu2Oo6q-nHWgg" name="Sub_Artifact A1.1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUBUDPEdqrhsZh3QNAMQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Ia4_7Ox4Edu2Oo6q-nHWgg" name="Artifact A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUBkDPEdqrhsZh3QNAMQ"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_Ia4_7ex4Edu2Oo6q-nHWgg" incomingConnections="_Ia4_5-x4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUAEDPEdqrhsZh3QNAMQ"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Ia4_7ux4Edu2Oo6q-nHWgg" name="Outcome B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUCUDPEdqrhsZh3QNAMQ"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_Ia4_7-x4Edu2Oo6q-nHWgg" name="Outcome A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_ZtZbMEDFEdqO9M3fukYA_A#_l5yUCkDPEdqrhsZh3QNAMQ"/>
+      </nodes>
+    </nodes>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_Ia4_8Ox4Edu2Oo6q-nHWgg" type="ADD" element="_Ia4_4-x4Edu2Oo6q-nHWgg" name="Activity for other plugin variability elements" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_Ia4_9Ox4Edu2Oo6q-nHWgg" type="1001" element="_Ia4_5Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ia4_9ex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ia4_9ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ia4_9-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ia4_-Ox4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ia4_-ux4Edu2Oo6q-nHWgg" x="30" y="236" width="221" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ia4_--x4Edu2Oo6q-nHWgg" type="1002" element="_Ia4_6Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ia4__Ox4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ia4__ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ia4__ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ia4__-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ia5AAex4Edu2Oo6q-nHWgg" x="132" y="1" width="94" height="215"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ia5AAux4Edu2Oo6q-nHWgg" type="1002" element="_Ia4_7ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ia5AA-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ia5ABOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ia5ABex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ia5ABux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ia5ACOx4Edu2Oo6q-nHWgg" x="137" y="323" width="84" height="166"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_Ia4_8ex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_Ia4_8ux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ia4_8-x4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/model.xmi
index 0272e7d..9cd39c0 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/capabilitypatterns/CP2 containing variability elements/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_ZzDXQUDFEdqO9M3fukYA_A" guid="_ZzDXQUDFEdqO9M3fukYA_A">
     <resourceDescriptors xmi:id="_ZzDXQkDFEdqO9M3fukYA_A" id="-icO6pIHdZm9Vxyc-JZ9Uyw" uri="content.xmi"/>
     <resourceDescriptors xmi:id="_tGF4wUDGEdqO9M3fukYA_A" id="-SrcVS-7dSYDE2Rpm7SIkyA" uri="content.xmi"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A1.xmi
index a2d2069..b212ab3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-5RTK1GOfBm2ccOjn1infsw" name="custom_category_A1,_MKPnkA-WEdqL2O1PJV9cZA" guid="-5RTK1GOfBm2ccOjn1infsw" changeDate="2005-08-18T17:53:15.828-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-5RTK1GOfBm2ccOjn1infsw" name="custom_category_A1,_MKPnkA-WEdqL2O1PJV9cZA" guid="-5RTK1GOfBm2ccOjn1infsw" changeDate="2005-08-18T17:53:15.828-0700">
   <mainDescription>Custom Category A1 main</mainDescription>
   <keyConsiderations>Custom Category A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A2.xmi
index 878d952..b523301 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/custom_category_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Vphz65Z1B9-rIMJKjX7h0A" name="custom_category_A2,_OSSSIA-WEdqL2O1PJV9cZA" guid="-Vphz65Z1B9-rIMJKjX7h0A" changeDate="2005-08-18T18:02:07.172-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Vphz65Z1B9-rIMJKjX7h0A" name="custom_category_A2,_OSSSIA-WEdqL2O1PJV9cZA" guid="-Vphz65Z1B9-rIMJKjX7h0A" changeDate="2005-08-18T18:02:07.172-0700">
   <mainDescription>Custom Category A2 main</mainDescription>
   <keyConsiderations>Custom Category A2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/sub_custom_category_A1.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/sub_custom_category_A1.1.xmi
index dd7f80e..04d51a2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/sub_custom_category_A1.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/customcategories/sub_custom_category_A1.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-jqSrbFZY9Gb4jpDiYSZcFQ" name="sub_custom_category_A1.1,_7dXYUBBKEdqBs7KhdVLRLA" guid="-jqSrbFZY9Gb4jpDiYSZcFQ" changeDate="2005-08-18T18:01:26.828-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-jqSrbFZY9Gb4jpDiYSZcFQ" name="sub_custom_category_A1.1,_7dXYUBBKEdqBs7KhdVLRLA" guid="-jqSrbFZY9Gb4jpDiYSZcFQ" changeDate="2005-08-18T18:01:26.828-0700">
   <mainDescription>Sub-Custom Category A1.1 main</mainDescription>
   <keyConsiderations>Sub-Custom Category A1.1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/content.xmi
index aac845b..b1eebb8 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/content.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-63usgQWFjV_gHmQYM3RUyw" name="delProcPak_A1.1,_uq5K8RM1Edqqndi-gDuxpw" guid="-63usgQWFjV_gHmQYM3RUyw">
+<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-63usgQWFjV_gHmQYM3RUyw" name="delProcPak_A1.1,_uq5K8RM1Edqqndi-gDuxpw" guid="-63usgQWFjV_gHmQYM3RUyw">
   <mainDescription>DelProcPak A1.1 main</mainDescription>
   <keyConsiderations>DelProcPak A1.1 key</keyConsiderations>
   <purpose>DelProcPak A1.1 porpoise</purpose>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/model.xmi
index 9383bde..e822291 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProcPak_A1.1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_uun0YBM1Edqqndi-gDuxpw" guid="_uun0YBM1Edqqndi-gDuxpw">
     <resourceDescriptors xmi:id="_uun0YRM1Edqqndi-gDuxpw" id="-63usgQWFjV_gHmQYM3RUyw" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/content.xmi
index 8481e1c..a6907c7 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/content.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-U8_LGvMSof-db24aFAMb6w" name="DelProc A1,_W6a4cRBNEdqBs7KhdVLRLA" guid="-U8_LGvMSof-db24aFAMb6w">
+<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-U8_LGvMSof-db24aFAMb6w" name="DelProc A1,_W6a4cRBNEdqBs7KhdVLRLA" guid="-U8_LGvMSof-db24aFAMb6w">
   <mainDescription>DelProc A1 main</mainDescription>
   <keyConsiderations>DelProc A1 key con</keyConsiderations>
   <purpose>DelProc A1 porpoise</purpose>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/model.xmi
index 2613d12..388f1ea 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/deliveryprocesses/delProc_A1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_XVY9MBBNEdqBs7KhdVLRLA" guid="_XVY9MBBNEdqBs7KhdVLRLA">
     <resourceDescriptors xmi:id="_XViuMBBNEdqBs7KhdVLRLA" id="-U8_LGvMSof-db24aFAMb6w" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplinegroupings/discipline_grouping_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplinegroupings/discipline_grouping_A1.xmi
index 76154fe..ba10b79 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplinegroupings/discipline_grouping_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplinegroupings/discipline_grouping_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-muAkXDJfo_KbRF4KObn9OQ" name="discipline_grouping_A1,_CCVjcA-WEdqL2O1PJV9cZA" guid="-muAkXDJfo_KbRF4KObn9OQ" changeDate="2005-08-18T17:42:37.781-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-muAkXDJfo_KbRF4KObn9OQ" name="discipline_grouping_A1,_CCVjcA-WEdqL2O1PJV9cZA" guid="-muAkXDJfo_KbRF4KObn9OQ" changeDate="2005-08-18T17:42:37.781-0700">
   <mainDescription>Discipline Grouping A1 main</mainDescription>
   <keyConsiderations>Discipline Grouping A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A1.xmi
index 32d5f49..bd3fcea 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-GaGl5kHJ4xKC_Shg6Z16Zg" name="discipline_A1,_C5d_wA-WEdqL2O1PJV9cZA" guid="-GaGl5kHJ4xKC_Shg6Z16Zg" changeDate="2005-08-22T10:45:02.969-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-GaGl5kHJ4xKC_Shg6Z16Zg" name="discipline_A1,_C5d_wA-WEdqL2O1PJV9cZA" guid="-GaGl5kHJ4xKC_Shg6Z16Zg" changeDate="2005-08-22T10:45:02.969-0700">
   <mainDescription>Discipline A1 main</mainDescription>
   <keyConsiderations>Discipline A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A2.xmi
index 8427b5f..39b458a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/disciplines/discipline_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Q0lia5yEyNXWd-KNJ6cGrA" name="discipline_A2,_DzvPoA-WEdqL2O1PJV9cZA" guid="-Q0lia5yEyNXWd-KNJ6cGrA" changeDate="2005-08-18T17:44:14.734-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Q0lia5yEyNXWd-KNJ6cGrA" name="discipline_A2,_DzvPoA-WEdqL2O1PJV9cZA" guid="-Q0lia5yEyNXWd-KNJ6cGrA" changeDate="2005-08-18T17:44:14.734-0700">
   <mainDescription>Discipline A2 main</mainDescription>
   <keyConsiderations>Discipline A2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A1.xmi
index 7df5efb..39f5f85 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-O13UuJb8GqBLVtWaUqgqRw" name="domain_A1,_FEzO4A-WEdqL2O1PJV9cZA" guid="-O13UuJb8GqBLVtWaUqgqRw" changeDate="2005-09-06T19:15:35.031-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-O13UuJb8GqBLVtWaUqgqRw" name="domain_A1,_FEzO4A-WEdqL2O1PJV9cZA" guid="-O13UuJb8GqBLVtWaUqgqRw" changeDate="2005-09-06T19:15:35.031-0700">
   <mainDescription>&lt;p&gt;
     Domain A1 main
 &lt;/p&gt;</mainDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A2.xmi
index 3630ceb..55556b5 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/domain_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-3hYJyr3TqiMg6Qdy9AXIxw" name="domain_A2,_FqWL8A-WEdqL2O1PJV9cZA" guid="-3hYJyr3TqiMg6Qdy9AXIxw" changeDate="2005-08-18T17:47:28.766-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-3hYJyr3TqiMg6Qdy9AXIxw" name="domain_A2,_FqWL8A-WEdqL2O1PJV9cZA" guid="-3hYJyr3TqiMg6Qdy9AXIxw" changeDate="2005-08-18T17:47:28.766-0700">
   <mainDescription>Domain A2 main</mainDescription>
   <keyConsiderations>Domain A2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/sub_domain_A1.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/sub_domain_A1.1.xmi
index 75db3a9..ffbca0a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/sub_domain_A1.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/domains/sub_domain_A1.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-KD72Eo5lMMPp7bS8oPBvPw" name="sub_domain_A1.1,_GOZ7QA-WEdqL2O1PJV9cZA" guid="-KD72Eo5lMMPp7bS8oPBvPw" changeDate="2005-08-18T17:46:53.922-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-KD72Eo5lMMPp7bS8oPBvPw" name="sub_domain_A1.1,_GOZ7QA-WEdqL2O1PJV9cZA" guid="-KD72Eo5lMMPp7bS8oPBvPw" changeDate="2005-08-18T17:46:53.922-0700">
   <mainDescription>Sub-Domain A1.1 main</mainDescription>
   <keyConsiderations>Sub-Domain A1.1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A1.xmi
index 345b1d8..41fb6c9 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-oWo3UCifX4Ic_VBICWwqRw" name="checklist_A1,_KV4q0A-SEdqL2O1PJV9cZA" guid="-oWo3UCifX4Ic_VBICWwqRw" changeDate="2005-08-18T14:30:34.125-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-oWo3UCifX4Ic_VBICWwqRw" name="checklist_A1,_KV4q0A-SEdqL2O1PJV9cZA" guid="-oWo3UCifX4Ic_VBICWwqRw" changeDate="2005-08-18T14:30:34.125-0700">
   <mainDescription>Checklist A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A2.xmi
index 51a88b0..f46c34e 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/checklists/checklist_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-J9Ur9smpQuvVGpuG9i_wkQ" name="checklist_A2,_kriTcA-TEdqL2O1PJV9cZA" guid="-J9Ur9smpQuvVGpuG9i_wkQ" changeDate="2005-08-18T14:30:36.219-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-J9Ur9smpQuvVGpuG9i_wkQ" name="checklist_A2,_kriTcA-TEdqL2O1PJV9cZA" guid="-J9Ur9smpQuvVGpuG9i_wkQ" changeDate="2005-08-18T14:30:36.219-0700">
   <mainDescription>Checklist A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A1.xmi
index 7e10bd2..2f12878 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-6y7aBQt3cCSBLo8smMRemA" name="concept_A1,_NDL-kA-SEdqL2O1PJV9cZA" guid="-6y7aBQt3cCSBLo8smMRemA" changeDate="2005-08-18T14:30:30.938-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-6y7aBQt3cCSBLo8smMRemA" name="concept_A1,_NDL-kA-SEdqL2O1PJV9cZA" guid="-6y7aBQt3cCSBLo8smMRemA" changeDate="2005-08-18T14:30:30.938-0700">
   <mainDescription>&lt;p&gt;
     Concept A1 content
 &lt;/p&gt;
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A2.xmi
index 061118f..a2d98f4 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/concepts/concept_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-LPIaxOHLXq9idGV41iUr9g" name="concept_A2,_OVLVcA-TEdqL2O1PJV9cZA" guid="-LPIaxOHLXq9idGV41iUr9g" changeDate="2005-08-18T14:30:24.578-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-LPIaxOHLXq9idGV41iUr9g" name="concept_A2,_OVLVcA-TEdqL2O1PJV9cZA" guid="-LPIaxOHLXq9idGV41iUr9g" changeDate="2005-08-18T14:30:24.578-0700">
   <mainDescription>Concept A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A1.xmi
index 7d349c8..ab6441f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-A949wHdTFqG3Ws63-q9B2w" name="example_A1,_OBxtwA-SEdqL2O1PJV9cZA" guid="-A949wHdTFqG3Ws63-q9B2w" changeDate="2005-08-18T14:30:38.969-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-A949wHdTFqG3Ws63-q9B2w" name="example_A1,_OBxtwA-SEdqL2O1PJV9cZA" guid="-A949wHdTFqG3Ws63-q9B2w" changeDate="2005-08-18T14:30:38.969-0700">
   <mainDescription>Example A1 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A2.xmi
index adf9ae9..f541244 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/examples/example_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-plD2M1shSE-LlbDw5yYprg" name="example_A2,_uajWcA-TEdqL2O1PJV9cZA" guid="-plD2M1shSE-LlbDw5yYprg" changeDate="2005-08-18T14:30:41.016-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-plD2M1shSE-LlbDw5yYprg" name="example_A2,_uajWcA-TEdqL2O1PJV9cZA" guid="-plD2M1shSE-LlbDw5yYprg" changeDate="2005-08-18T14:30:41.016-0700">
   <mainDescription>Example A1 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A1.xmi
index 3b7004e..26ce05f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-_21_EisQSTHwtlJjoJ8bvw" name="guideline_A1,_OkCtUA-SEdqL2O1PJV9cZA" guid="-_21_EisQSTHwtlJjoJ8bvw" changeDate="2005-08-18T14:30:43.312-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-_21_EisQSTHwtlJjoJ8bvw" name="guideline_A1,_OkCtUA-SEdqL2O1PJV9cZA" guid="-_21_EisQSTHwtlJjoJ8bvw" changeDate="2005-08-18T14:30:43.312-0700">
   <mainDescription>Guideline A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A2.xmi
index 8a654e4..f84a8cc 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/guidelines/guideline_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-PcZttV-sc-EcUQwB-ZhAIw" name="guideline_A2,_6YUwAA-TEdqL2O1PJV9cZA" guid="-PcZttV-sc-EcUQwB-ZhAIw" changeDate="2005-08-18T14:30:45.734-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-PcZttV-sc-EcUQwB-ZhAIw" name="guideline_A2,_6YUwAA-TEdqL2O1PJV9cZA" guid="-PcZttV-sc-EcUQwB-ZhAIw" changeDate="2005-08-18T14:30:45.734-0700">
   <mainDescription>Guideline A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.1.xmi
index 9ca62d2..f917b51 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-9xP4d7ba6oswGkPepXWk_w" name="practice_A1.1,_-FSUgA-UEdqL2O1PJV9cZA" guid="-9xP4d7ba6oswGkPepXWk_w" changeDate="2005-08-18T14:31:20.703-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-9xP4d7ba6oswGkPepXWk_w" name="practice_A1.1,_-FSUgA-UEdqL2O1PJV9cZA" guid="-9xP4d7ba6oswGkPepXWk_w" changeDate="2005-08-18T14:31:20.703-0700">
   <mainDescription>Practice A1.1 content</mainDescription>
   <additionalInfo>Practice A1.1 add</additionalInfo>
   <problem>Practice A1.1 problem</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.xmi
index 517a554..1e6332b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Z7kdIkCp-mHUdb_JoQpzWQ" name="practice_A1,_P8jYYA-SEdqL2O1PJV9cZA" guid="-Z7kdIkCp-mHUdb_JoQpzWQ" changeDate="2005-08-18T14:31:18.297-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Z7kdIkCp-mHUdb_JoQpzWQ" name="practice_A1,_P8jYYA-SEdqL2O1PJV9cZA" guid="-Z7kdIkCp-mHUdb_JoQpzWQ" changeDate="2005-08-18T14:31:18.297-0700">
   <mainDescription>Practice A1 content</mainDescription>
   <additionalInfo>Practice A1 add</additionalInfo>
   <problem>Practice A1 problem</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.1.xmi
index 2ad17ba..febdbc3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-R9sQzoJjQm4-NBxUqaLWLg" name="practice_A2.1,_JrgwwA-VEdqL2O1PJV9cZA" guid="-R9sQzoJjQm4-NBxUqaLWLg" changeDate="2005-08-18T14:31:25.094-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-R9sQzoJjQm4-NBxUqaLWLg" name="practice_A2.1,_JrgwwA-VEdqL2O1PJV9cZA" guid="-R9sQzoJjQm4-NBxUqaLWLg" changeDate="2005-08-18T14:31:25.094-0700">
   <mainDescription>Practice A2.1 content</mainDescription>
   <additionalInfo>Practice A2.1 add</additionalInfo>
   <problem>Practice A2.1 problem</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.xmi
index 1ce4f8f..cb8d2e2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/practices/practice_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-NcSMTfhMlttPUK2F6wXgEg" name="practice_A2,_EpfoYA-VEdqL2O1PJV9cZA" guid="-NcSMTfhMlttPUK2F6wXgEg" changeDate="2005-08-18T14:31:23.094-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-NcSMTfhMlttPUK2F6wXgEg" name="practice_A2,_EpfoYA-VEdqL2O1PJV9cZA" guid="-NcSMTfhMlttPUK2F6wXgEg" changeDate="2005-08-18T14:31:23.094-0700">
   <mainDescription>Practice A2 content</mainDescription>
   <additionalInfo>Practice A2 add</additionalInfo>
   <problem>Practice A2 problem</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A1.xmi
index 50073ac..712f010 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-XReBLdN4iLbvaffBwebNCw" name="report_A1,_Q5Dc4A-SEdqL2O1PJV9cZA" guid="-XReBLdN4iLbvaffBwebNCw" changeDate="2005-08-18T14:30:51.422-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-XReBLdN4iLbvaffBwebNCw" name="report_A1,_Q5Dc4A-SEdqL2O1PJV9cZA" guid="-XReBLdN4iLbvaffBwebNCw" changeDate="2005-08-18T14:30:51.422-0700">
   <mainDescription>Report A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A2.xmi
index 4895632..ccf3ff4 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reports/report_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-5LndmdxxbG1M1MfpAPKpAQ" name="report_A2,_GrGwQA-UEdqL2O1PJV9cZA" guid="-5LndmdxxbG1M1MfpAPKpAQ" changeDate="2005-08-18T14:30:53.984-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-5LndmdxxbG1M1MfpAPKpAQ" name="report_A2,_GrGwQA-UEdqL2O1PJV9cZA" guid="-5LndmdxxbG1M1MfpAPKpAQ" changeDate="2005-08-18T14:30:53.984-0700">
   <mainDescription>Report A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A1.xmi
index 3c3d208..ad0fc4a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-1hHEOL8qyxTMMR775UGfrw" name="reusable_asset_A1,_TV0aQA-SEdqL2O1PJV9cZA" guid="-1hHEOL8qyxTMMR775UGfrw" changeDate="2005-08-18T14:31:27.219-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-1hHEOL8qyxTMMR775UGfrw" name="reusable_asset_A1,_TV0aQA-SEdqL2O1PJV9cZA" guid="-1hHEOL8qyxTMMR775UGfrw" changeDate="2005-08-18T14:31:27.219-0700">
   <mainDescription>Reusable Asset A1 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A2.xmi
index 0244abf..47f7c93 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/reusableassets/reusable_asset_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-7glGYiJas9hZGkJ9ccQ5KQ" name="reusable_asset_A2,_SMc3EA-VEdqL2O1PJV9cZA" guid="-7glGYiJas9hZGkJ9ccQ5KQ" changeDate="2005-08-18T14:31:29.422-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-7glGYiJas9hZGkJ9ccQ5KQ" name="reusable_asset_A2,_SMc3EA-VEdqL2O1PJV9cZA" guid="-7glGYiJas9hZGkJ9ccQ5KQ" changeDate="2005-08-18T14:31:29.422-0700">
   <mainDescription>Reusable Asset A2 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A1.xmi
index 562db87..cbb6678 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-xoDZaqr7J-wf2lB7rSjSZw" name="roadmap_A1,_Zk39gA-SEdqL2O1PJV9cZA" guid="-xoDZaqr7J-wf2lB7rSjSZw" changeDate="2005-08-18T14:30:04.047-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-xoDZaqr7J-wf2lB7rSjSZw" name="roadmap_A1,_Zk39gA-SEdqL2O1PJV9cZA" guid="-xoDZaqr7J-wf2lB7rSjSZw" changeDate="2005-08-18T14:30:04.047-0700">
   <mainDescription>Roadmap A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A2.xmi
index fdc7bdd..483d9e9 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/roadmaps/roadmap_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-J0szwrKbiL2Jm-FifQtI9w" name="roadmap_A2,_YukgQA-VEdqL2O1PJV9cZA" guid="-J0szwrKbiL2Jm-FifQtI9w" changeDate="2005-08-18T14:30:06.859-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-J0szwrKbiL2Jm-FifQtI9w" name="roadmap_A2,_YukgQA-VEdqL2O1PJV9cZA" guid="-J0szwrKbiL2Jm-FifQtI9w" changeDate="2005-08-18T14:30:06.859-0700">
   <mainDescription>Roadmap A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A1.xmi
index df5f8c6..da45bf6 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-46AJlAvt5BDYfL9_g-2R7w" name="supporting_material_A1,_aFpvUA-SEdqL2O1PJV9cZA" guid="-46AJlAvt5BDYfL9_g-2R7w" changeDate="2005-08-18T14:31:01.281-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-46AJlAvt5BDYfL9_g-2R7w" name="supporting_material_A1,_aFpvUA-SEdqL2O1PJV9cZA" guid="-46AJlAvt5BDYfL9_g-2R7w" changeDate="2005-08-18T14:31:01.281-0700">
   <mainDescription>Supporting Material A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A2.xmi
index f0e6ba5..ff2b60c 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/supportingmaterials/supporting_material_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-7w53jFOzwpNBgeCD_A_vYg" name="supporting_material_A2,_mPs_cA-UEdqL2O1PJV9cZA" guid="-7w53jFOzwpNBgeCD_A_vYg" changeDate="2005-08-18T14:31:03.516-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-7w53jFOzwpNBgeCD_A_vYg" name="supporting_material_A2,_mPs_cA-UEdqL2O1PJV9cZA" guid="-7w53jFOzwpNBgeCD_A_vYg" changeDate="2005-08-18T14:31:03.516-0700">
   <mainDescription>Supporting Material A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A1.xmi
index 578546b..5ac6f69 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-c9sb9Di4MYmR-RooFkP3jw" name="template_A1,_bFIPUA-SEdqL2O1PJV9cZA" guid="-c9sb9Di4MYmR-RooFkP3jw" changeDate="2005-08-18T14:30:56.484-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-c9sb9Di4MYmR-RooFkP3jw" name="template_A1,_bFIPUA-SEdqL2O1PJV9cZA" guid="-c9sb9Di4MYmR-RooFkP3jw" changeDate="2005-08-18T14:30:56.484-0700">
   <mainDescription>Template A1 content</mainDescription>
 </org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A2.xmi
index 0836c24..da1fca3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/templates/template_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-hLSOWrG5biSX-PAk_3Bb9A" name="template_A2,_ZXq9EA-UEdqL2O1PJV9cZA" guid="-hLSOWrG5biSX-PAk_3Bb9A" changeDate="2005-08-18T14:30:58.953-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-hLSOWrG5biSX-PAk_3Bb9A" name="template_A2,_ZXq9EA-UEdqL2O1PJV9cZA" guid="-hLSOWrG5biSX-PAk_3Bb9A" changeDate="2005-08-18T14:30:58.953-0700">
   <mainDescription>Template A2 content</mainDescription>
 </org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A1.xmi
index de3768e..e20b83a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-NvctSum7mmO4q_08gLpD5A" name="term_definition_A1,_sfiJUA-VEdqL2O1PJV9cZA" guid="-NvctSum7mmO4q_08gLpD5A" changeDate="2005-08-18T14:30:12.141-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-NvctSum7mmO4q_08gLpD5A" name="term_definition_A1,_sfiJUA-VEdqL2O1PJV9cZA" guid="-NvctSum7mmO4q_08gLpD5A" changeDate="2005-08-18T14:30:12.141-0700">
   <mainDescription>Term Definition A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A2.xmi
index 35d504f..a7f9d04 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/termdefinitions/term_definition_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-8BPRIg_SbHTwQAiAZy83Pw" name="term_definition_A2,_o8I7EA-VEdqL2O1PJV9cZA" guid="-8BPRIg_SbHTwQAiAZy83Pw" changeDate="2005-08-18T14:31:42.656-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-8BPRIg_SbHTwQAiAZy83Pw" name="term_definition_A2,_o8I7EA-VEdqL2O1PJV9cZA" guid="-8BPRIg_SbHTwQAiAZy83Pw" changeDate="2005-08-18T14:31:42.656-0700">
   <mainDescription>Term Definition A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A1.xmi
index 8dbd30a..cdadcd2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-p4xkQmPzEqanXn1kSbWYAg" name="toolmentor_A1,_hHEjoA-SEdqL2O1PJV9cZA" guid="-p4xkQmPzEqanXn1kSbWYAg" changeDate="2005-08-18T14:31:05.828-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-p4xkQmPzEqanXn1kSbWYAg" name="toolmentor_A1,_hHEjoA-SEdqL2O1PJV9cZA" guid="-p4xkQmPzEqanXn1kSbWYAg" changeDate="2005-08-18T14:31:05.828-0700">
   <mainDescription>Toolmentor A1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A2.xmi
index 89484fd..b550c88 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/toolmentors/toolmentor_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-sxVq-5aaIe3zt5aEun8FCg" name="toolmentor_A2,_v7JKAA-UEdqL2O1PJV9cZA" guid="-sxVq-5aaIe3zt5aEun8FCg" changeDate="2005-08-18T14:31:08.594-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-sxVq-5aaIe3zt5aEun8FCg" name="toolmentor_A2,_v7JKAA-UEdqL2O1PJV9cZA" guid="-sxVq-5aaIe3zt5aEun8FCg" changeDate="2005-08-18T14:31:08.594-0700">
   <mainDescription>Toolmentor A2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A1.xmi
index 027b0ef..3a346ae 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-7PZHLFSKVLsYOANn0gGqIw" name="whitepaper_A1,_h8RGQA-SEdqL2O1PJV9cZA" guid="-7PZHLFSKVLsYOANn0gGqIw" changeDate="2005-08-18T14:31:13.359-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-7PZHLFSKVLsYOANn0gGqIw" name="whitepaper_A1,_h8RGQA-SEdqL2O1PJV9cZA" guid="-7PZHLFSKVLsYOANn0gGqIw" changeDate="2005-08-18T14:31:13.359-0700">
   <mainDescription>Whitepaper A1 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A2.xmi
index 072b92c..77dbae2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/guidances/whitepapers/whitepaper_A2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-tGDFih5T1ltVnMZef8A76w" name="whitepaper_A2,_3Xr0EA-UEdqL2O1PJV9cZA" guid="-tGDFih5T1ltVnMZef8A76w" changeDate="2005-08-18T14:31:15.578-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-tGDFih5T1ltVnMZef8A76w" name="whitepaper_A2,_3Xr0EA-UEdqL2O1PJV9cZA" guid="-tGDFih5T1ltVnMZef8A76w" changeDate="2005-08-18T14:31:15.578-0700">
   <mainDescription>Whitepaper A2 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/plugin.xmi
index 1f3a356..7db1fcc 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_6lK2AA-PEdqL2O1PJV9cZA" guid="_6lK2AA-PEdqL2O1PJV9cZA">
     <subManagers xmi:id="_XVY9MBBNEdqBs7KhdVLRLA" href="uma://_W6a4cBBNEdqBs7KhdVLRLA#_XVY9MBBNEdqBs7KhdVLRLA"/>
     <subManagers xmi:id="_cnWmEBBNEdqBs7KhdVLRLA" href="uma://_aHUSQBBNEdqBs7KhdVLRLA#_cnWmEBBNEdqBs7KhdVLRLA"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A1.xmi
index 1a94351..338f98f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-g7m98Jl8aRbV6nfOGUpGng" name="role_A1,_55zk0A-PEdqL2O1PJV9cZA" guid="-g7m98Jl8aRbV6nfOGUpGng" changeDate="2005-10-18T16:04:10.609-0700">
+<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-g7m98Jl8aRbV6nfOGUpGng" name="role_A1,_55zk0A-PEdqL2O1PJV9cZA" guid="-g7m98Jl8aRbV6nfOGUpGng" changeDate="2005-10-18T16:04:10.609-0700">
   <mainDescription>Role A1 main</mainDescription>
   <keyConsiderations>Role A1 key</keyConsiderations>
   <skills>Role A1 skills</skills>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A2.xmi
index c4d3c3c..01151cb 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-HxkcViHu57bDGul421rBvg" name="role_A2,_6k3UAA-PEdqL2O1PJV9cZA" guid="-HxkcViHu57bDGul421rBvg" changeDate="2005-10-19T10:32:35.422-0700">
+<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-HxkcViHu57bDGul421rBvg" name="role_A2,_6k3UAA-PEdqL2O1PJV9cZA" guid="-HxkcViHu57bDGul421rBvg" changeDate="2005-10-19T10:32:35.422-0700">
   <mainDescription>Role A2 main</mainDescription>
   <keyConsiderations>Role A2 key</keyConsiderations>
   <skills>Role A2 skills</skills>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A3.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A3.xmi
index 3b4efbb..c266306 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A3.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/roles/role_A3.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-YumdsUOHFVhGkewwICNdgw" name="new_role,_8ZN6AEDFEdqO9M3fukYA_A" guid="-YumdsUOHFVhGkewwICNdgw" changeDate="2005-10-19T10:29:59.453-0700">
+<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-YumdsUOHFVhGkewwICNdgw" name="new_role,_8ZN6AEDFEdqO9M3fukYA_A" guid="-YumdsUOHFVhGkewwICNdgw" changeDate="2005-10-19T10:29:59.453-0700">
   <mainDescription>main: Role A3</mainDescription>
   <keyConsiderations>key: Role A3</keyConsiderations>
   <skills>skills: Role A3</skills>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesetgroupings/role_set_grouping_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesetgroupings/role_set_grouping_A1.xmi
index 32fb738..46e091c 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesetgroupings/role_set_grouping_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesetgroupings/role_set_grouping_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-FV99K0VM7f4clAUkYboFOQ" name="role_set_grouping_A1,_JYn0gA-WEdqL2O1PJV9cZA" guid="-FV99K0VM7f4clAUkYboFOQ" changeDate="2005-08-18T17:49:31.641-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-FV99K0VM7f4clAUkYboFOQ" name="role_set_grouping_A1,_JYn0gA-WEdqL2O1PJV9cZA" guid="-FV99K0VM7f4clAUkYboFOQ" changeDate="2005-08-18T17:49:31.641-0700">
   <mainDescription>Role Set Grouping A1 main</mainDescription>
   <keyConsiderations>Role Set Grouping A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A1.xmi
index 7b18a10..a1b1a94 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-WGa9NQJ-bM5UZ0JuY_AEPw" name="role_set_A1,_9Pp1UBBKEdqBs7KhdVLRLA" guid="-WGa9NQJ-bM5UZ0JuY_AEPw" changeDate="2005-08-22T10:47:23.250-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-WGa9NQJ-bM5UZ0JuY_AEPw" name="role_set_A1,_9Pp1UBBKEdqBs7KhdVLRLA" guid="-WGa9NQJ-bM5UZ0JuY_AEPw" changeDate="2005-08-22T10:47:23.250-0700">
   <mainDescription>Role Set A1 main</mainDescription>
   <keyConsiderations>Role Set A11 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A2.xmi
index 74f4291..6805f33 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/rolesets/role_set_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-LRGleHIpNs5Mb9QAOGfZQw" name="role_set_A2,_-ubgcBBKEdqBs7KhdVLRLA" guid="-LRGleHIpNs5Mb9QAOGfZQw" changeDate="2005-08-18T17:50:40.328-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-LRGleHIpNs5Mb9QAOGfZQw" name="role_set_A2,_-ubgcBBKEdqBs7KhdVLRLA" guid="-LRGleHIpNs5Mb9QAOGfZQw" changeDate="2005-08-18T17:50:40.328-0700">
   <mainDescription>Role Set A2 main</mainDescription>
   <keyConsiderations>Role Set A2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A1.xmi
index 582f07d..a7e19a5 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A1.xmi
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-S1igLSi6AI_vluzWOCu6Tw" name="task_A1,_7M8nsA-PEdqL2O1PJV9cZA" guid="-S1igLSi6AI_vluzWOCu6Tw" changeDate="2005-10-19T10:28:39.422-0700">
+<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-S1igLSi6AI_vluzWOCu6Tw" name="task_A1,_7M8nsA-PEdqL2O1PJV9cZA" guid="-S1igLSi6AI_vluzWOCu6Tw" changeDate="2005-10-19T10:28:39.422-0700">
   <mainDescription>Task A1 main</mainDescription>
-  <keyConsiderations>Task A1 key</keyConsiderations>
   <sections xmi:id="_tvF4MBBPEdqBs7KhdVLRLA" name="Step A1.1" guid="_tvF4MBBPEdqBs7KhdVLRLA">
     <sectionDescription>alpha</sectionDescription>
   </sections>
@@ -11,6 +10,7 @@
   <sections xmi:id="_uCBbQBBPEdqBs7KhdVLRLA" name="Step A1.3" guid="_uCBbQBBPEdqBs7KhdVLRLA">
     <sectionDescription>gamma</sectionDescription>
   </sections>
+  <keyConsiderations>Task A1 key</keyConsiderations>
   <purpose>Task A1 purpose</purpose>
   <alternatives>Task A1 alt</alternatives>
 </org.eclipse.epf.uma:TaskDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A2.xmi
index 5830841..76d7b71 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A2.xmi
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-13q8JJAa0ix6rDMZAqwy1w" name="task_A2,_75NQwA-PEdqL2O1PJV9cZA" guid="-13q8JJAa0ix6rDMZAqwy1w" changeDate="2005-10-19T10:29:22.547-0700">
+<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-13q8JJAa0ix6rDMZAqwy1w" name="task_A2,_75NQwA-PEdqL2O1PJV9cZA" guid="-13q8JJAa0ix6rDMZAqwy1w" changeDate="2005-10-19T10:29:22.547-0700">
   <mainDescription>Task A2 main</mainDescription>
-  <keyConsiderations>Task A2 key</keyConsiderations>
   <sections xmi:id="_ti2BYBBOEdqBs7KhdVLRLA" name="Step A2.1" guid="_ti2BYBBOEdqBs7KhdVLRLA">
     <sectionDescription>&lt;p&gt;
     put your right foot in
@@ -13,6 +12,7 @@
   <sections xmi:id="_tndboBBOEdqBs7KhdVLRLA" name="Step A2.3" guid="_tndboBBOEdqBs7KhdVLRLA">
     <sectionDescription>Do the hokey-pokey</sectionDescription>
   </sections>
+  <keyConsiderations>Task A2 key</keyConsiderations>
   <purpose>Task A2 purpose</purpose>
   <alternatives>Task A2 alt</alternatives>
 </org.eclipse.epf.uma:TaskDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A3.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A3.xmi
index 36316f3..533af3c 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A3.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tasks/task_A3.xmi
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-bR9TX1bZ6W9RY5IvIPGUjg" name=",_oUluEEDFEdqO9M3fukYA_A" guid="-bR9TX1bZ6W9RY5IvIPGUjg" changeDate="2005-10-19T10:27:43.000-0700">
+<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-bR9TX1bZ6W9RY5IvIPGUjg" name=",_oUluEEDFEdqO9M3fukYA_A" guid="-bR9TX1bZ6W9RY5IvIPGUjg" changeDate="2005-10-19T10:27:43.000-0700">
   <mainDescription>main: Task A3</mainDescription>
-  <keyConsiderations>keys: Task A3</keyConsiderations>
   <sections xmi:id="_rCWwUEDPEdqrhsZh3QNAMQ" name="Step A3.1" guid="_rCWwUEDPEdqrhsZh3QNAMQ">
     <sectionDescription>Step A3.1</sectionDescription>
   </sections>
@@ -11,6 +10,7 @@
   <sections xmi:id="_vx5BkEDPEdqrhsZh3QNAMQ" name="Step A3.3" guid="_vx5BkEDPEdqrhsZh3QNAMQ">
     <sectionDescription>Step A3.3</sectionDescription>
   </sections>
+  <keyConsiderations>keys: Task A3</keyConsiderations>
   <purpose>purpose: Task A3</purpose>
   <alternatives>alternatives: Task A3</alternatives>
 </org.eclipse.epf.uma:TaskDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A1.xmi
index e39a03b..ef42702 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-y04wPE10-SB8iFnu5cXaMA" name="tool_A1,_KxbagA-WEdqL2O1PJV9cZA" guid="-y04wPE10-SB8iFnu5cXaMA" changeDate="2005-08-18T17:52:07.203-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-y04wPE10-SB8iFnu5cXaMA" name="tool_A1,_KxbagA-WEdqL2O1PJV9cZA" guid="-y04wPE10-SB8iFnu5cXaMA" changeDate="2005-08-18T17:52:07.203-0700">
   <mainDescription>Tool A1 main</mainDescription>
   <keyConsiderations>Tool A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A2.xmi
index bcda868..b373bf2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/tools/tool_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-zzBP-54GuQWfVTz60SdQsw" name="tool_A2,_LhaF8A-WEdqL2O1PJV9cZA" guid="-zzBP-54GuQWfVTz60SdQsw" changeDate="2005-08-18T17:52:34.578-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-zzBP-54GuQWfVTz60SdQsw" name="tool_A2,_LhaF8A-WEdqL2O1PJV9cZA" guid="-zzBP-54GuQWfVTz60SdQsw" changeDate="2005-08-18T17:52:34.578-0700">
   <mainDescription>Tool A2 main</mainDescription>
   <keyConsiderations>Tool A2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A1.xmi
index 352305d..0c300bb 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-n9TJQa0FJvG_avDXaATjIQ" name="artifact_A1 x,_9Kt78A-PEdqL2O1PJV9cZA" guid="-n9TJQa0FJvG_avDXaATjIQ" changeDate="2005-09-07T14:52:44.984-0700">
+<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-n9TJQa0FJvG_avDXaATjIQ" name="artifact_A1 x,_9Kt78A-PEdqL2O1PJV9cZA" guid="-n9TJQa0FJvG_avDXaATjIQ" changeDate="2005-09-07T14:52:44.984-0700">
   <mainDescription>Artifact A1 main</mainDescription>
   <keyConsiderations>Artifact A1 key</keyConsiderations>
   <externalId>Artifact A1 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.1.xmi
index a1daf69..85a91f1 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-UFRoeAKHdXX2SSB1KUXtYA" name="artifact_A2.1,_HEMtEA-REdqL2O1PJV9cZA" guid="-UFRoeAKHdXX2SSB1KUXtYA" changeDate="2005-08-17T19:44:07.781-0700">
+<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-UFRoeAKHdXX2SSB1KUXtYA" name="artifact_A2.1,_HEMtEA-REdqL2O1PJV9cZA" guid="-UFRoeAKHdXX2SSB1KUXtYA" changeDate="2005-08-17T19:44:07.781-0700">
   <mainDescription>Artifact A2.1 main</mainDescription>
   <keyConsiderations>Artifact A2.1 key</keyConsiderations>
   <externalId>Artifact A2.1 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.xmi
index 73890b1..7b9b3aa 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/artifact_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-JTWKn5d4CLc4KFQMDTFpSQ" name="artifact_A2,_E7Z0kA-REdqL2O1PJV9cZA" guid="-JTWKn5d4CLc4KFQMDTFpSQ" changeDate="2005-08-17T19:41:24.391-0700">
+<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-JTWKn5d4CLc4KFQMDTFpSQ" name="artifact_A2,_E7Z0kA-REdqL2O1PJV9cZA" guid="-JTWKn5d4CLc4KFQMDTFpSQ" changeDate="2005-08-17T19:41:24.391-0700">
   <mainDescription>Artifact A2 main</mainDescription>
   <keyConsiderations>Artifact A2 key</keyConsiderations>
   <externalId>Artifact A2 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A1.xmi
index d81b6a1..8062a25 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-AbXRg44L8Txx4CkB2hx5NQ" name="deliverable_A1,_IISnUA-REdqL2O1PJV9cZA" guid="-AbXRg44L8Txx4CkB2hx5NQ" changeDate="2005-08-18T14:29:59.391-0700">
+<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-AbXRg44L8Txx4CkB2hx5NQ" name="deliverable_A1,_IISnUA-REdqL2O1PJV9cZA" guid="-AbXRg44L8Txx4CkB2hx5NQ" changeDate="2005-08-18T14:29:59.391-0700">
   <mainDescription>Deliverable A1 main</mainDescription>
   <keyConsiderations>Deliverable A1 key</keyConsiderations>
   <externalId>Deliverable A1 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A2.xmi
index 9b31343..99f47e3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/deliverable_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Mdqoa-nxwEHfAJcoA6XNKQ" name="deliverable_A2,_JBqfUA-REdqL2O1PJV9cZA" guid="-Mdqoa-nxwEHfAJcoA6XNKQ" changeDate="2005-08-18T14:30:15.172-0700">
+<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Mdqoa-nxwEHfAJcoA6XNKQ" name="deliverable_A2,_JBqfUA-REdqL2O1PJV9cZA" guid="-Mdqoa-nxwEHfAJcoA6XNKQ" changeDate="2005-08-18T14:30:15.172-0700">
   <mainDescription>Deliverable A2 main</mainDescription>
   <keyConsiderations>Deliverable A2 key</keyConsiderations>
   <externalId>Deliverable A2 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A1.xmi
index ed80c06..ad8b461 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-3odyByIezRRXgQgeHuM6SA" name="outcome_A1,_KA_1YA-REdqL2O1PJV9cZA" guid="-3odyByIezRRXgQgeHuM6SA" changeDate="2005-08-18T14:30:18.188-0700" changeDescription=" Outcome A1 ">
+<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-3odyByIezRRXgQgeHuM6SA" name="outcome_A1,_KA_1YA-REdqL2O1PJV9cZA" guid="-3odyByIezRRXgQgeHuM6SA" changeDate="2005-08-18T14:30:18.188-0700" changeDescription=" Outcome A1 ">
   <mainDescription>Outcome A1 main</mainDescription>
   <keyConsiderations>Outcome A1 key</keyConsiderations>
   <externalId>Outcome A1 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A2.xmi
index 08a7129..ecb1e43 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/outcome_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-4GbAWGb87Alz-Gz_G_9p1g" name="outcome_A2,_KvLxEA-REdqL2O1PJV9cZA" guid="-4GbAWGb87Alz-Gz_G_9p1g" changeDate="2005-08-18T14:30:21.281-0700">
+<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-4GbAWGb87Alz-Gz_G_9p1g" name="outcome_A2,_KvLxEA-REdqL2O1PJV9cZA" guid="-4GbAWGb87Alz-Gz_G_9p1g" changeDate="2005-08-18T14:30:21.281-0700">
   <mainDescription>Outcome A1 main</mainDescription>
   <keyConsiderations>Outcome A1 key</keyConsiderations>
   <externalId>Outcome A1 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/sub_artifact_A1.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/sub_artifact_A1.1.xmi
index da0c58f..bb2a5c4 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/sub_artifact_A1.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducts/sub_artifact_A1.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-9n1WX5d7IFhVJ4pzHV_vrQ" name="sub_artifact_A1.1,_F51ywA-REdqL2O1PJV9cZA" guid="-9n1WX5d7IFhVJ4pzHV_vrQ" changeDate="2005-08-18T18:04:19.312-0700">
+<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-9n1WX5d7IFhVJ4pzHV_vrQ" name="sub_artifact_A1.1,_F51ywA-REdqL2O1PJV9cZA" guid="-9n1WX5d7IFhVJ4pzHV_vrQ" changeDate="2005-08-18T18:04:19.312-0700">
   <mainDescription>Sub_Artifact A1.1 main</mainDescription>
   <keyConsiderations>Sub_Artifact A1.1 key</keyConsiderations>
   <externalId>Sub_Artifact A1.1 unique</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A1.xmi
index 3d141c7..a67c8f3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-TfRDoHismshj8cL2lORtcg" name="work_product_type_A1,_HghDYA-WEdqL2O1PJV9cZA" guid="-TfRDoHismshj8cL2lORtcg" changeDate="2005-08-18T18:02:44.125-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-TfRDoHismshj8cL2lORtcg" name="work_product_type_A1,_HghDYA-WEdqL2O1PJV9cZA" guid="-TfRDoHismshj8cL2lORtcg" changeDate="2005-08-18T18:02:44.125-0700">
   <mainDescription>Work Product Type A1 main</mainDescription>
   <keyConsiderations>Work Product Type A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A2.xmi
index e04553b..2354765 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug A/workproducttypes/work_product_type_A2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-clfDA0PM6xLIjyhSp1iLQQ" name="work_product_type_A2,_IFnUgA-WEdqL2O1PJV9cZA" guid="-clfDA0PM6xLIjyhSp1iLQQ" changeDate="2005-08-18T18:03:16.344-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-clfDA0PM6xLIjyhSp1iLQQ" name="work_product_type_A2,_IFnUgA-WEdqL2O1PJV9cZA" guid="-clfDA0PM6xLIjyhSp1iLQQ" changeDate="2005-08-18T18:03:16.344-0700">
   <mainDescription>Work Product Type A1 main</mainDescription>
   <keyConsiderations>Work Product Type A1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/content.xmi
index 38498f9..a23e084 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-wybHKUdlXbDFG0HOPhAJ6Q" name="CP A1,_dBhvkUAvEdqFqIu8-ckolg" guid="-wybHKUdlXbDFG0HOPhAJ6Q"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-wybHKUdlXbDFG0HOPhAJ6Q" name="CP A1,_dBhvkUAvEdqFqIu8-ckolg" guid="-wybHKUdlXbDFG0HOPhAJ6Q"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/diagram.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/diagram.xmi
new file mode 100644
index 0000000..2c5569f
--- /dev/null
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/diagram.xmi
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:org.eclipse.epf.diagram.model="http://www.eclipse.org/epf/diagram/1.0.0/diagram.ecore" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML">
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_Ic_RoOx4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:CapabilityPattern" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YokA5EdqFqIu8-ckolg"/>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_Ic_Roex4Edu2Oo6q-nHWgg" type="ADD" element="_Ic_RoOx4Edu2Oo6q-nHWgg" name="CP B1" measurementUnit="Pixel">
+    <styles xmi:type="notation:PageStyle" xmi:id="_Ic_Roux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_Ic_Ro-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ic_RpOx4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <uml:Activity xmi:id="_Ie_cwOx4Edu2Oo6q-nHWgg" name="Act1">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ie_cwex4Edu2Oo6q-nHWgg" source="uma_element">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ie_cwux4Edu2Oo6q-nHWgg" key="uri" value="uma://_56xnQEA5EdqFqIu8-ckolg#_567YQ0A5EdqFqIu8-ckolg"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ie_cw-x4Edu2Oo6q-nHWgg" key="type" value="Activity"/>
+    </eAnnotations>
+    <node xmi:type="uml:ActivityParameterNode" xmi:id="_IgJTUOx4Edu2Oo6q-nHWgg" name="Task A1 present">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IgVgkOx4Edu2Oo6q-nHWgg" source="uma_element">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IgVgkex4Edu2Oo6q-nHWgg" key="uri" value="uma://_56xnQEA5EdqFqIu8-ckolg#_567YSUA5EdqFqIu8-ckolg"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IgVgkux4Edu2Oo6q-nHWgg" key="type" value="Task"/>
+      </eAnnotations>
+    </node>
+    <node xmi:type="uml:ActivityParameterNode" xmi:id="_Ih3Kkux4Edu2Oo6q-nHWgg" name="Task B1 presnet">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ih3Kk-x4Edu2Oo6q-nHWgg" source="uma_element">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ih3KlOx4Edu2Oo6q-nHWgg" key="uri" value="uma://_56xnQEA5EdqFqIu8-ckolg#_567YR0A5EdqFqIu8-ckolg"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ih3Klex4Edu2Oo6q-nHWgg" key="type" value="Task"/>
+      </eAnnotations>
+    </node>
+    <node xmi:type="uml:ActivityParameterNode" xmi:id="_Ih3Kn-x4Edu2Oo6q-nHWgg" name="Task B2 present">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ih3KoOx4Edu2Oo6q-nHWgg" source="uma_element">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ih3Koex4Edu2Oo6q-nHWgg" key="uri" value="uma://_56xnQEA5EdqFqIu8-ckolg#_567YREA5EdqFqIu8-ckolg"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ih3Koux4Edu2Oo6q-nHWgg" key="type" value="Task"/>
+      </eAnnotations>
+    </node>
+    <node xmi:type="uml:ActivityParameterNode" xmi:id="_Ih3KrOx4Edu2Oo6q-nHWgg" name="Task A2 ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ih3Krex4Edu2Oo6q-nHWgg" source="uma_element">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ih3Krux4Edu2Oo6q-nHWgg" key="uri" value="uma://_56xnQEA5EdqFqIu8-ckolg#_567YRkA5EdqFqIu8-ckolg"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ih3Kr-x4Edu2Oo6q-nHWgg" key="type" value="Task"/>
+      </eAnnotations>
+    </node>
+  </uml:Activity>
+  <notation:Diagram xmi:id="_IfRwoOx4Edu2Oo6q-nHWgg" type="AD" element="_Ie_cwOx4Edu2Oo6q-nHWgg" name="Act1" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_Ihk2sOx4Edu2Oo6q-nHWgg" type="1009" element="_IgJTUOx4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IhxD8Ox4Edu2Oo6q-nHWgg" type="4008"/>
+      <children xmi:type="notation:Node" xmi:id="_Ih3KkOx4Edu2Oo6q-nHWgg" type="4008"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ihk2sex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ihk2sux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ihk2s-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ihk2tOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ih3Kkex4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ih3Klux4Edu2Oo6q-nHWgg" type="1009" element="_Ih3Kkux4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_Ih3KnOx4Edu2Oo6q-nHWgg" type="4008"/>
+      <children xmi:type="notation:Node" xmi:id="_Ih3Knex4Edu2Oo6q-nHWgg" type="4008"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ih3Kl-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ih3KmOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ih3Kmex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ih3Kmux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ih3Knux4Edu2Oo6q-nHWgg" x="10" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ih3Ko-x4Edu2Oo6q-nHWgg" type="1009" element="_Ih3Kn-x4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_Ih3Kqex4Edu2Oo6q-nHWgg" type="4008"/>
+      <children xmi:type="notation:Node" xmi:id="_Ih3Kqux4Edu2Oo6q-nHWgg" type="4008"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ih3KpOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ih3Kpex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ih3Kpux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ih3Kp-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ih3Kq-x4Edu2Oo6q-nHWgg" x="129" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Ih3KsOx4Edu2Oo6q-nHWgg" type="1009" element="_Ih3KrOx4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_Ih9RMOx4Edu2Oo6q-nHWgg" type="4008"/>
+      <children xmi:type="notation:Node" xmi:id="_Ih9RMex4Edu2Oo6q-nHWgg" type="4008"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ih3Ksex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ih3Ksux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ih3Ks-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ih3KtOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ih9RMux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_IfRwoex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IfRwoux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IfRwo-x4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:ActivityDetailDiagram xmi:id="_IiVr0Ox4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YQ0A5EdqFqIu8-ckolg"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IiVr0ex4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YSEA5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_IiVr0ux4Edu2Oo6q-nHWgg" name="Role A1">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YSEA5EdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_IiVr0-x4Edu2Oo6q-nHWgg" incomingConnections="_IiVr1ux4Edu2Oo6q-nHWgg" name="Task A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YSUA5EdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr1Ox4Edu2Oo6q-nHWgg" target="_IiVr2ex4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr1ex4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YSUA5EdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr1ux4Edu2Oo6q-nHWgg" target="_IiVr0-x4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr1-x4Edu2Oo6q-nHWgg" name="Sub_Artifact A1.1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YoUA5EdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr2Ox4Edu2Oo6q-nHWgg" name="Artifact A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YnkA5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr2ex4Edu2Oo6q-nHWgg" incomingConnections="_IiVr1Ox4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YSUA5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr2ux4Edu2Oo6q-nHWgg" name="Outcome A1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yn0A5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IiVr2-x4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yk0A5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_IiVr3Ox4Edu2Oo6q-nHWgg" name="Role B1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yk0A5EdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_IiVr3ex4Edu2Oo6q-nHWgg" incomingConnections="_IiVr4Ox4Edu2Oo6q-nHWgg" name="Task B1 presnet">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YR0A5EdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr3ux4Edu2Oo6q-nHWgg" target="_IiVr4ux4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr3-x4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YR0A5EdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr4Ox4Edu2Oo6q-nHWgg" target="_IiVr3ex4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr4ex4Edu2Oo6q-nHWgg" name="Artifact B1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YnUA5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr4ux4Edu2Oo6q-nHWgg" incomingConnections="_IiVr3ux4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YR0A5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr4-x4Edu2Oo6q-nHWgg" name="Outcome B1 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YlUA5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IiVr5Ox4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yl0A5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_IiVr5ex4Edu2Oo6q-nHWgg" name="Role B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yl0A5EdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_IiVr5ux4Edu2Oo6q-nHWgg" incomingConnections="_IiVr6ex4Edu2Oo6q-nHWgg" name="Task B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YREA5EdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr5-x4Edu2Oo6q-nHWgg" target="_IiVr6-x4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr6Ox4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YREA5EdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr6ex4Edu2Oo6q-nHWgg" target="_IiVr5ux4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr6ux4Edu2Oo6q-nHWgg" name="Artifact B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YQkA5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr6-x4Edu2Oo6q-nHWgg" incomingConnections="_IiVr5-x4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YREA5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr7Ox4Edu2Oo6q-nHWgg" name="Outcome B2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YlkA5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:RoleTaskComposite" xmi:id="_IiVr7ex4Edu2Oo6q-nHWgg">
+      <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YmUA5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:RoleNode" xmi:id="_IiVr7ux4Edu2Oo6q-nHWgg" name="Role A2 ">
+        <linkedElement xmi:type="org.eclipse.epf.uma:RoleDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YmUA5EdqFqIu8-ckolg"/>
+      </nodes>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:TaskNode" xmi:id="_IiVr7-x4Edu2Oo6q-nHWgg" incomingConnections="_IiVr8ux4Edu2Oo6q-nHWgg" name="Task A2 ">
+        <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YRkA5EdqFqIu8-ckolg"/>
+        <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr8Ox4Edu2Oo6q-nHWgg" target="_IiVr9Ox4Edu2Oo6q-nHWgg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr8ex4Edu2Oo6q-nHWgg" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YRkA5EdqFqIu8-ckolg"/>
+      <outgoingConnections xmi:type="org.eclipse.epf.diagram.model:Link" xmi:id="_IiVr8ux4Edu2Oo6q-nHWgg" target="_IiVr7-x4Edu2Oo6q-nHWgg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr8-x4Edu2Oo6q-nHWgg" name="Artifact A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YkEA5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductComposite" xmi:id="_IiVr9Ox4Edu2Oo6q-nHWgg" incomingConnections="_IiVr8Ox4Edu2Oo6q-nHWgg" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:TaskDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YRkA5EdqFqIu8-ckolg"/>
+      <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductDescriptorNode" xmi:id="_IiVr9ex4Edu2Oo6q-nHWgg" name="Outcome A2 present">
+        <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yj0A5EdqFqIu8-ckolg"/>
+      </nodes>
+    </nodes>
+  </org.eclipse.epf.diagram.model:ActivityDetailDiagram>
+  <notation:Diagram xmi:id="_IiVr9ux4Edu2Oo6q-nHWgg" type="ADD" element="_IiVr0Ox4Edu2Oo6q-nHWgg" name="Act1" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_IiVr-ux4Edu2Oo6q-nHWgg" type="1001" element="_IiVr0ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IiVr--x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVr_Ox4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IiVr_ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IiVr_ux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IiVsAOx4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IiVsAex4Edu2Oo6q-nHWgg" type="1002" element="_IiVr1ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IiVsAux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVsA-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IiVsBOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IiVsBex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IiVsB-x4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IiVsCOx4Edu2Oo6q-nHWgg" type="1002" element="_IiVr2ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IiVsCex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVsCux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IiVsC-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IiVsDOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IiVsDux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IiVsD-x4Edu2Oo6q-nHWgg" type="1001" element="_IiVr2-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IiVsEOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVsEex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IiVsEux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IiVsE-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IiVsFex4Edu2Oo6q-nHWgg" x="20" y="88" width="196" height="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IiVsFux4Edu2Oo6q-nHWgg" type="1002" element="_IiVr3-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IiVsF-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVsGOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IiVsGex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IiVsGux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IiVsHOx4Edu2Oo6q-nHWgg" x="130" y="1" width="73" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IiVsHex4Edu2Oo6q-nHWgg" type="1002" element="_IiVr4ux4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IiVsHux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVsH-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IiVsIOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IiVsIex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IibyUOx4Edu2Oo6q-nHWgg" x="130" y="161" width="73" height="111"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IibyUex4Edu2Oo6q-nHWgg" type="1001" element="_IiVr5Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IibyUux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IibyU-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IibyVOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IibyVex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IibyV-x4Edu2Oo6q-nHWgg" x="20" y="400" width="196" height="53"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IibyWOx4Edu2Oo6q-nHWgg" type="1002" element="_IiVr6Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IibyWex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IibyWux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IibyW-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IibyXOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IibyXux4Edu2Oo6q-nHWgg" x="130" y="313" width="73" height="67"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IibyX-x4Edu2Oo6q-nHWgg" type="1002" element="_IiVr6-x4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IibyYOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IibyYex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IibyYux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IibyY-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IibyZex4Edu2Oo6q-nHWgg" x="130" y="473" width="73" height="111"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IibyZux4Edu2Oo6q-nHWgg" type="1001" element="_IiVr7ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IibyZ-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IibyaOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Iibyaex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Iibyaux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IibybOx4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Iibybex4Edu2Oo6q-nHWgg" type="1002" element="_IiVr8ex4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Iibybux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Iibyb-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IibycOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Iibycex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iibyc-x4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IibydOx4Edu2Oo6q-nHWgg" type="1002" element="_IiVr9Ox4Edu2Oo6q-nHWgg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Iibydex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Iibydux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Iibyd-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IibyeOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iibyeux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_IiVr9-x4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IiVr-Ox4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IiVr-ex4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+  <org.eclipse.epf.diagram.model:WorkProductDependencyDiagram xmi:id="_IjSt8Ox4Edu2Oo6q-nHWgg">
+    <linkedElement xmi:type="org.eclipse.epf.uma:Activity" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YQ0A5EdqFqIu8-ckolg"/>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt8ex4Edu2Oo6q-nHWgg" name="Artifact A1 present" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YnkA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt8ux4Edu2Oo6q-nHWgg" name="Deliverable A1 present" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YmEA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt8-x4Edu2Oo6q-nHWgg" name="Outcome A1 present" type="3">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yn0A5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt9Ox4Edu2Oo6q-nHWgg" name="Artifact B1 present" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YnUA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt9ex4Edu2Oo6q-nHWgg" name="Deliverable B1 present" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YoEA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt9ux4Edu2Oo6q-nHWgg" name="Outcome B1 present" type="3">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YlUA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt9-x4Edu2Oo6q-nHWgg" name="Artifact B2 present" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YQkA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt-Ox4Edu2Oo6q-nHWgg" name="Deliverable B2 present" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YlEA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt-ex4Edu2Oo6q-nHWgg" name="Outcome B2 present" type="3">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YlkA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt-ux4Edu2Oo6q-nHWgg" name="Artifact A2 present" type="1">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567YkEA5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt--x4Edu2Oo6q-nHWgg" name="Deliverable A2 present" type="2">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Ym0A5EdqFqIu8-ckolg"/>
+    </nodes>
+    <nodes xmi:type="org.eclipse.epf.diagram.model:WorkProductNode" xmi:id="_IjSt_Ox4Edu2Oo6q-nHWgg" name="Outcome A2 present" type="3">
+      <linkedElement xmi:type="org.eclipse.epf.uma:WorkProductDescriptor" href="uma://_56xnQEA5EdqFqIu8-ckolg#_567Yj0A5EdqFqIu8-ckolg"/>
+    </nodes>
+  </org.eclipse.epf.diagram.model:WorkProductDependencyDiagram>
+  <notation:Diagram xmi:id="_IjY0kOx4Edu2Oo6q-nHWgg" type="WPDD" element="_IjSt8Ox4Edu2Oo6q-nHWgg" name="Act1" measurementUnit="Pixel">
+    <children xmi:type="notation:Node" xmi:id="_Ije7MOx4Edu2Oo6q-nHWgg" type="1001" element="_IjSt8ex4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjlB0Ox4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjlB0ex4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ije7Mex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ije7Mux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_Ije7M-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_Ije7NOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjlB0ux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjlB0-x4Edu2Oo6q-nHWgg" type="1001" element="_IjSt8ux4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjlB2ex4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjlB2ux4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjlB1Ox4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjlB1ex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjlB1ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjlB1-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjlB2-x4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjlB3Ox4Edu2Oo6q-nHWgg" type="1001" element="_IjSt8-x4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjlB4ux4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjlB4-x4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjlB3ex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjlB3ux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjlB3-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjlB4Ox4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjlB5Ox4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjlB5ex4Edu2Oo6q-nHWgg" type="1001" element="_IjSt9Ox4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjrIcOx4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjrIcex4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjlB5ux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjlB5-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjlB6Ox4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjlB6ex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjrIcux4Edu2Oo6q-nHWgg" x="10" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjrIc-x4Edu2Oo6q-nHWgg" type="1001" element="_IjSt9ex4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjrIeex4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjrIeux4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjrIdOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjrIdex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjrIdux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjrId-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjrIe-x4Edu2Oo6q-nHWgg" x="142" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjrIfOx4Edu2Oo6q-nHWgg" type="1001" element="_IjSt9ux4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjrIgux4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjrIg-x4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjrIfex4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjrIfux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjrIf-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjrIgOx4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjrIhOx4Edu2Oo6q-nHWgg" x="291" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjrIhex4Edu2Oo6q-nHWgg" type="1001" element="_IjSt9-x4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjrIi-x4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjrIjOx4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjrIhux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjrIh-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjrIiOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjrIiex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjrIjex4Edu2Oo6q-nHWgg" x="430" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjrIjux4Edu2Oo6q-nHWgg" type="1001" element="_IjSt-Ox4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjrIlOx4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjrIlex4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjrIj-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjrIkOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjrIkex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjrIkux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjrIlux4Edu2Oo6q-nHWgg" x="562" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjrIl-x4Edu2Oo6q-nHWgg" type="1001" element="_IjSt-ex4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjrInex4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjrInux4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjrImOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjrImex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjrImux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjrIm-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjxPEOx4Edu2Oo6q-nHWgg" x="711" y="10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjxPEex4Edu2Oo6q-nHWgg" type="1001" element="_IjSt-ux4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjxPF-x4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjxPGOx4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjxPEux4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjxPE-x4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjxPFOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjxPFex4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjxPGex4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjxPGux4Edu2Oo6q-nHWgg" type="1001" element="_IjSt--x4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjxPIOx4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjxPIex4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjxPG-x4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjxPHOx4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjxPHex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjxPHux4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjxPIux4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_IjxPI-x4Edu2Oo6q-nHWgg" type="1001" element="_IjSt_Ox4Edu2Oo6q-nHWgg">
+      <children xmi:type="notation:Node" xmi:id="_IjxPKex4Edu2Oo6q-nHWgg" type="4001"/>
+      <children xmi:type="notation:Node" xmi:id="_IjxPKux4Edu2Oo6q-nHWgg" type="4001"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IjxPJOx4Edu2Oo6q-nHWgg" fontName="Arial" fontHeight="8"/>
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjxPJex4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:FillStyle" xmi:id="_IjxPJux4Edu2Oo6q-nHWgg"/>
+      <styles xmi:type="notation:LineStyle" xmi:id="_IjxPJ-x4Edu2Oo6q-nHWgg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IjxPK-x4Edu2Oo6q-nHWgg" x="-1" y="-1"/>
+    </children>
+    <styles xmi:type="notation:PageStyle" xmi:id="_IjY0kex4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:GuideStyle" xmi:id="_IjY0kux4Edu2Oo6q-nHWgg"/>
+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_IjY0k-x4Edu2Oo6q-nHWgg"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/model.xmi
index e1af355..5c4470b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/CP B1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_59wCwEA5EdqFqIu8-ckolg" guid="_59wCwEA5EdqFqIu8-ckolg">
     <resourceDescriptors xmi:id="_59wCwUA5EdqFqIu8-ckolg" id="-wybHKUdlXbDFG0HOPhAJ6Q" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/content.xmi
index cf3d385..cd73299 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-oEuOdeWJctGfTNYUz82Zng" name="capPat_B1.1,_IPdZ4R81EdqgBITuICLJEw" guid="-oEuOdeWJctGfTNYUz82Zng"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-oEuOdeWJctGfTNYUz82Zng" name="capPat_B1.1,_IPdZ4R81EdqgBITuICLJEw" guid="-oEuOdeWJctGfTNYUz82Zng"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/model.xmi
index f9dad87..f26a632 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1.1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_ITCSUB81EdqgBITuICLJEw" guid="_ITCSUB81EdqgBITuICLJEw">
     <resourceDescriptors xmi:id="_ITCSUR81EdqgBITuICLJEw" id="-oEuOdeWJctGfTNYUz82Zng" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/content.xmi
index f05488b..8e8cac8 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-X83K1o9bsplNe1_a_KU2FQ" name="capPat_B1,_E6EycR81EdqgBITuICLJEw" guid="-X83K1o9bsplNe1_a_KU2FQ"/>
+<org.eclipse.epf.uma:ProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-X83K1o9bsplNe1_a_KU2FQ" name="capPat_B1,_E6EycR81EdqgBITuICLJEw" guid="-X83K1o9bsplNe1_a_KU2FQ"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/model.xmi
index d7d5e65..bb92875 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/capabilitypatterns/capPat_B1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_E8miAB81EdqgBITuICLJEw" guid="_E8miAB81EdqgBITuICLJEw">
     <resourceDescriptors xmi:id="_E8wTAB81EdqgBITuICLJEw" id="-X83K1o9bsplNe1_a_KU2FQ" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.1.xmi
index 5933d9d..ebdea3a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-YzcKaT3GYZXRkY3ZMr_mRg" name="custom_category_B1.1,_XfTdoB80EdqgBITuICLJEw" guid="-YzcKaT3GYZXRkY3ZMr_mRg" changeDate="2005-09-06T17:14:44.078-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-YzcKaT3GYZXRkY3ZMr_mRg" name="custom_category_B1.1,_XfTdoB80EdqgBITuICLJEw" guid="-YzcKaT3GYZXRkY3ZMr_mRg" changeDate="2005-09-06T17:14:44.078-0700">
   <mainDescription>Custom Category B1.1 main</mainDescription>
   <keyConsiderations>Custom Category B1.1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.xmi
index 01e958c..7abde35 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-WPqhxUpx4uG6Wyr5Ujfoig" name="custom_category_B1,_3ESZQB8yEdqgBITuICLJEw" guid="-WPqhxUpx4uG6Wyr5Ujfoig" changeDate="2005-09-06T17:05:40.641-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-WPqhxUpx4uG6Wyr5Ujfoig" name="custom_category_B1,_3ESZQB8yEdqgBITuICLJEw" guid="-WPqhxUpx4uG6Wyr5Ujfoig" changeDate="2005-09-06T17:05:40.641-0700">
   <mainDescription>Custom Category B1 main</mainDescription>
   <keyConsiderations>Custom Category B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B2.xmi
index 4554ff6..1b1f2a7 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/customcategories/custom_category_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-8XfPmt55HNBVUy_fWSvN5Q" name="custom_category_B2,_3sEyAB8yEdqgBITuICLJEw" guid="-8XfPmt55HNBVUy_fWSvN5Q" changeDate="2005-09-06T17:06:12.812-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-8XfPmt55HNBVUy_fWSvN5Q" name="custom_category_B2,_3sEyAB8yEdqgBITuICLJEw" guid="-8XfPmt55HNBVUy_fWSvN5Q" changeDate="2005-09-06T17:06:12.812-0700">
   <mainDescription>Custom Category B2 main</mainDescription>
   <keyConsiderations>Custom Category B2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/content.xmi
index 6019abc..4684335 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-VLAXVhqEY2tU70ESZZv7Fg" name="delProc_B1.1,_V0V7MR81EdqgBITuICLJEw" guid="-VLAXVhqEY2tU70ESZZv7Fg"/>
+<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-VLAXVhqEY2tU70ESZZv7Fg" name="delProc_B1.1,_V0V7MR81EdqgBITuICLJEw" guid="-VLAXVhqEY2tU70ESZZv7Fg"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/model.xmi
index 6d674fd..ad691a3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1.1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_V3LMwB81EdqgBITuICLJEw" guid="_V3LMwB81EdqgBITuICLJEw">
     <resourceDescriptors xmi:id="_V3LMwR81EdqgBITuICLJEw" id="-VLAXVhqEY2tU70ESZZv7Fg" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/content.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/content.xmi
index 0ac571f..812616e 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/content.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/content.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-cdRCCCF11Vh7RIIeJ_kf4w" name="delProc_B1,_RfxusR81EdqgBITuICLJEw" guid="-cdRCCCF11Vh7RIIeJ_kf4w"/>
+<org.eclipse.epf.uma:DeliveryProcessDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-cdRCCCF11Vh7RIIeJ_kf4w" name="delProc_B1,_RfxusR81EdqgBITuICLJEw" guid="-cdRCCCF11Vh7RIIeJ_kf4w"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/model.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/model.xmi
index 36df63c..0e70dfc 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/model.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/deliveryprocesses/delProc_B1/model.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_RiKUUB81EdqgBITuICLJEw" guid="_RiKUUB81EdqgBITuICLJEw">
     <resourceDescriptors xmi:id="_RiKUUR81EdqgBITuICLJEw" id="-cdRCCCF11Vh7RIIeJ_kf4w" uri="content.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplinegroupings/discipline_grouping_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplinegroupings/discipline_grouping_B1.xmi
index ebb10f1..d67c2a7 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplinegroupings/discipline_grouping_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplinegroupings/discipline_grouping_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-6rvm3uvzqI0y8h-1PvVf7A" name="discipline_grouping_B1,_SZMxYB8yEdqgBITuICLJEw" guid="-6rvm3uvzqI0y8h-1PvVf7A" changeDate="2005-09-06T17:00:19.312-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-6rvm3uvzqI0y8h-1PvVf7A" name="discipline_grouping_B1,_SZMxYB8yEdqgBITuICLJEw" guid="-6rvm3uvzqI0y8h-1PvVf7A" changeDate="2005-09-06T17:00:19.312-0700">
   <mainDescription>Discipline Grouping B1 main</mainDescription>
   <keyConsiderations>Discipline Grouping B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B1.xmi
index f64a014..1126695 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-FefJmaBMUnPFLZh9FSu_9g" name="discipline_B1,_cY57wB8yEdqgBITuICLJEw" guid="-FefJmaBMUnPFLZh9FSu_9g" changeDate="2005-09-06T17:00:57.719-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-FefJmaBMUnPFLZh9FSu_9g" name="discipline_B1,_cY57wB8yEdqgBITuICLJEw" guid="-FefJmaBMUnPFLZh9FSu_9g" changeDate="2005-09-06T17:00:57.719-0700">
   <mainDescription>Discipline B1 main</mainDescription>
   <keyConsiderations>Discipline B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B2.xmi
index 83fb74b..2304c19 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/disciplines/discipline_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-hE5NVPzMBcfvXVO4ulo1rA" name="discipline_B2,_h9flsB8yEdqgBITuICLJEw" guid="-hE5NVPzMBcfvXVO4ulo1rA" changeDate="2005-09-06T17:01:34.250-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-hE5NVPzMBcfvXVO4ulo1rA" name="discipline_B2,_h9flsB8yEdqgBITuICLJEw" guid="-hE5NVPzMBcfvXVO4ulo1rA" changeDate="2005-09-06T17:01:34.250-0700">
   <mainDescription>&lt;p&gt;
     Discipline B2 main
 &lt;/p&gt;</mainDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B1.xmi
index 12634f1..9a9748b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-kFjkxogJ4jAOz-gWQPsqLA" name="domain_B1,_mdrzYB8yEdqgBITuICLJEw" guid="-kFjkxogJ4jAOz-gWQPsqLA" changeDate="2005-09-06T17:02:04.781-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-kFjkxogJ4jAOz-gWQPsqLA" name="domain_B1,_mdrzYB8yEdqgBITuICLJEw" guid="-kFjkxogJ4jAOz-gWQPsqLA" changeDate="2005-09-06T17:02:04.781-0700">
   <mainDescription>Domain B1 main</mainDescription>
   <keyConsiderations>Domain B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B2.xmi
index 02d3485..84daf1d 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/domains/domain_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-UjaVo3oylLtmObW1e25ttw" name="domain_B2,_raoOgB8yEdqgBITuICLJEw" guid="-UjaVo3oylLtmObW1e25ttw" changeDate="2005-09-06T17:02:37.750-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-UjaVo3oylLtmObW1e25ttw" name="domain_B2,_raoOgB8yEdqgBITuICLJEw" guid="-UjaVo3oylLtmObW1e25ttw" changeDate="2005-09-06T17:02:37.750-0700">
   <mainDescription>Domain B2 main</mainDescription>
   <keyConsiderations>Domain B2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B1.xmi
index 7cd963f..0b11e65 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Gai-0vCnqB0WgKck1bmnpw" name="checklist_B1,_urLdcB8rEdqQvOjX8doCCw" guid="-Gai-0vCnqB0WgKck1bmnpw" changeDate="2005-09-06T16:27:22.656-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Gai-0vCnqB0WgKck1bmnpw" name="checklist_B1,_urLdcB8rEdqQvOjX8doCCw" guid="-Gai-0vCnqB0WgKck1bmnpw" changeDate="2005-09-06T16:27:22.656-0700">
   <mainDescription>Checklist B1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B2.xmi
index 050ab77..9913bd2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/checklists/checklist_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-W7wDHVeIQEDP59e9D41Kuw" name="checklist_B2,_wEuqUB8rEdqQvOjX8doCCw" guid="-W7wDHVeIQEDP59e9D41Kuw" changeDate="2005-09-06T16:28:04.281-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-W7wDHVeIQEDP59e9D41Kuw" name="checklist_B2,_wEuqUB8rEdqQvOjX8doCCw" guid="-W7wDHVeIQEDP59e9D41Kuw" changeDate="2005-09-06T16:28:04.281-0700">
   <mainDescription>Checklist B2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B1.xmi
index b1dc550..a372d5e 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-n-HWZiKfXq9RRRKeFOB0UA" name="concept_B1,_w6E98B8rEdqQvOjX8doCCw" guid="-n-HWZiKfXq9RRRKeFOB0UA" changeDate="2005-09-06T16:16:01.734-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-n-HWZiKfXq9RRRKeFOB0UA" name="concept_B1,_w6E98B8rEdqQvOjX8doCCw" guid="-n-HWZiKfXq9RRRKeFOB0UA" changeDate="2005-09-06T16:16:01.734-0700">
   <mainDescription>Concept B1 context</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B2.xmi
index 9d24319..455bff5 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/concepts/concept_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-6LpOgicWShw2CdBhVZHq0w" name="concept_B2,_xnFN4B8rEdqQvOjX8doCCw" guid="-6LpOgicWShw2CdBhVZHq0w" changeDate="2005-09-06T16:16:27.812-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-6LpOgicWShw2CdBhVZHq0w" name="concept_B2,_xnFN4B8rEdqQvOjX8doCCw" guid="-6LpOgicWShw2CdBhVZHq0w" changeDate="2005-09-06T16:16:27.812-0700">
   <mainDescription>Concept B2 context</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B1.xmi
index 287db79..8009804 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-bD-2iEGRhdL7uhk9VgY1iQ" name="example_B1,_yQzgUB8rEdqQvOjX8doCCw" guid="-bD-2iEGRhdL7uhk9VgY1iQ" changeDate="2005-09-06T16:28:37.578-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-bD-2iEGRhdL7uhk9VgY1iQ" name="example_B1,_yQzgUB8rEdqQvOjX8doCCw" guid="-bD-2iEGRhdL7uhk9VgY1iQ" changeDate="2005-09-06T16:28:37.578-0700">
   <mainDescription>Example B1 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B2.xmi
index 8f449b1..d5134bc 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/examples/example_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-OdkQN7gyUzdb-lV5KHQs9A" name="new_example_B2,_zAoawB8rEdqQvOjX8doCCw" guid="-OdkQN7gyUzdb-lV5KHQs9A" changeDate="2005-09-06T16:29:18.094-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-OdkQN7gyUzdb-lV5KHQs9A" name="new_example_B2,_zAoawB8rEdqQvOjX8doCCw" guid="-OdkQN7gyUzdb-lV5KHQs9A" changeDate="2005-09-06T16:29:18.094-0700">
   <mainDescription>Example B2 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B1.xmi
index f45995b..336025a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-0i3DLCoaI4xhW_s34Lp7Jw" name="guideline_B1,_zkZPIB8rEdqQvOjX8doCCw" guid="-0i3DLCoaI4xhW_s34Lp7Jw" changeDate="2005-09-06T16:37:55.188-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-0i3DLCoaI4xhW_s34Lp7Jw" name="guideline_B1,_zkZPIB8rEdqQvOjX8doCCw" guid="-0i3DLCoaI4xhW_s34Lp7Jw" changeDate="2005-09-06T16:37:55.188-0700">
   <mainDescription>Guideline B1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B2.xmi
index bbbd274..feaebf7 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/guidelines/guideline_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-axKRGLGxbv3FE2HHmEbqdw" name="guideline_B2,_0QguQB8rEdqQvOjX8doCCw" guid="-axKRGLGxbv3FE2HHmEbqdw" changeDate="2005-09-06T16:46:54.438-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-axKRGLGxbv3FE2HHmEbqdw" name="guideline_B2,_0QguQB8rEdqQvOjX8doCCw" guid="-axKRGLGxbv3FE2HHmEbqdw" changeDate="2005-09-06T16:46:54.438-0700">
   <mainDescription>Guideline B2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.1.xmi
index 1cb4361..b22dff8 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-gVvB0PxRK75MxoOdm930_w" name="practice_B1.1,_2vM-QB8rEdqQvOjX8doCCw" guid="-gVvB0PxRK75MxoOdm930_w" changeDate="2005-09-06T16:43:48.172-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-gVvB0PxRK75MxoOdm930_w" name="practice_B1.1,_2vM-QB8rEdqQvOjX8doCCw" guid="-gVvB0PxRK75MxoOdm930_w" changeDate="2005-09-06T16:43:48.172-0700">
   <mainDescription>Practice B1.1 content</mainDescription>
   <additionalInfo>Practice B1.1 add</additionalInfo>
   <problem>Practice B1.1 prob</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.xmi
index 4ecd9df..39d66d0 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-yNsKwwP8BZfs12PbZA5AeQ" name="practice_B1,_1I-nUB8rEdqQvOjX8doCCw" guid="-yNsKwwP8BZfs12PbZA5AeQ" changeDate="2005-09-06T16:42:00.047-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-yNsKwwP8BZfs12PbZA5AeQ" name="practice_B1,_1I-nUB8rEdqQvOjX8doCCw" guid="-yNsKwwP8BZfs12PbZA5AeQ" changeDate="2005-09-06T16:42:00.047-0700">
   <mainDescription>Practice B1 content</mainDescription>
   <additionalInfo>Practice B1 add</additionalInfo>
   <problem>Practice B1 prob</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B2.xmi
index 81e658b..bf0a020 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/practices/practice_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-DxlMtvKiuVHu-ktZ2U2ZTA" name="practice_B2,_4i1fEB8rEdqQvOjX8doCCw" guid="-DxlMtvKiuVHu-ktZ2U2ZTA" changeDate="2005-09-06T16:40:50.734-0700">
+<org.eclipse.epf.uma:PracticeDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-DxlMtvKiuVHu-ktZ2U2ZTA" name="practice_B2,_4i1fEB8rEdqQvOjX8doCCw" guid="-DxlMtvKiuVHu-ktZ2U2ZTA" changeDate="2005-09-06T16:40:50.734-0700">
   <mainDescription>Practice B2 content</mainDescription>
   <additionalInfo>Practice B2 add</additionalInfo>
   <problem>Practice B2 prob</problem>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B1.xmi
index b5d9513..aa6cad0 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-6iMOXKjhPTMqpag54bQ3ww" name="report_B1,_5kjawB8rEdqQvOjX8doCCw" guid="-6iMOXKjhPTMqpag54bQ3ww" changeDate="2005-09-06T16:38:38.391-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-6iMOXKjhPTMqpag54bQ3ww" name="report_B1,_5kjawB8rEdqQvOjX8doCCw" guid="-6iMOXKjhPTMqpag54bQ3ww" changeDate="2005-09-06T16:38:38.391-0700">
   <mainDescription>Report B1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B2.xmi
index e900e16..8d83c3a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reports/report_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-u5Da8LxfQRhH6Lh5cv_bZA" name="report_B2,_6OuZIB8rEdqQvOjX8doCCw" guid="-u5Da8LxfQRhH6Lh5cv_bZA" changeDate="2005-09-06T16:39:07.656-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-u5Da8LxfQRhH6Lh5cv_bZA" name="report_B2,_6OuZIB8rEdqQvOjX8doCCw" guid="-u5Da8LxfQRhH6Lh5cv_bZA" changeDate="2005-09-06T16:39:07.656-0700">
   <mainDescription>Report B2 context</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B1.xmi
index 83136b0..db04532 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-e_pBG3d909NB0OvnfQoJ9A" name="reusable_asset_B1,_67k4EB8rEdqQvOjX8doCCw" guid="-e_pBG3d909NB0OvnfQoJ9A" changeDate="2005-09-06T16:46:19.250-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-e_pBG3d909NB0OvnfQoJ9A" name="reusable_asset_B1,_67k4EB8rEdqQvOjX8doCCw" guid="-e_pBG3d909NB0OvnfQoJ9A" changeDate="2005-09-06T16:46:19.250-0700">
   <mainDescription>Reusable Asset B1 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B2.xmi
index 7db3f84..ec4d32b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/reusableassets/reusable_asset_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-0a23g-aQhcZrTH7p2rtyAQ" name="reusable_asset_B2,_7xOGoB8rEdqQvOjX8doCCw" guid="-0a23g-aQhcZrTH7p2rtyAQ" changeDate="2005-09-06T16:40:00.000-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-0a23g-aQhcZrTH7p2rtyAQ" name="reusable_asset_B2,_7xOGoB8rEdqQvOjX8doCCw" guid="-0a23g-aQhcZrTH7p2rtyAQ" changeDate="2005-09-06T16:40:00.000-0700">
   <mainDescription>Reusable Asset B2 content</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B1.xmi
index d69551d..c940a36 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-eaJZrWeFVc4PEMA9Kv10DA" name="roadmap_B1,_8hWjEB8rEdqQvOjX8doCCw" guid="-eaJZrWeFVc4PEMA9Kv10DA" changeDate="2005-09-06T16:36:02.812-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-eaJZrWeFVc4PEMA9Kv10DA" name="roadmap_B1,_8hWjEB8rEdqQvOjX8doCCw" guid="-eaJZrWeFVc4PEMA9Kv10DA" changeDate="2005-09-06T16:36:02.812-0700">
   <mainDescription>Roadmap B1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B2.xmi
index 380a39a..113bcd3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/roadmaps/roadmap_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-3nQ5JgPIE1JmzQmTIZhKtg" name="roadmap_B2,_-gwPAB8rEdqQvOjX8doCCw" guid="-3nQ5JgPIE1JmzQmTIZhKtg" changeDate="2005-09-06T16:35:35.719-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-3nQ5JgPIE1JmzQmTIZhKtg" name="roadmap_B2,_-gwPAB8rEdqQvOjX8doCCw" guid="-3nQ5JgPIE1JmzQmTIZhKtg" changeDate="2005-09-06T16:35:35.719-0700">
   <mainDescription>Roadmap B2 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B1.xmi
index 4a0ea21..39612d0 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-JFijy-E9vnZ5QJZJT1AA2A" name="supporting_material_B1,__bKo0B8rEdqQvOjX8doCCw" guid="-JFijy-E9vnZ5QJZJT1AA2A" changeDate="2005-09-06T16:45:31.234-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-JFijy-E9vnZ5QJZJT1AA2A" name="supporting_material_B1,__bKo0B8rEdqQvOjX8doCCw" guid="-JFijy-E9vnZ5QJZJT1AA2A" changeDate="2005-09-06T16:45:31.234-0700">
   <mainDescription>Supporting Material B1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B2.xmi
index 6a46924..b19de30 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/supportingmaterials/supporting_material_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-ilbNOaq635vJGeb6uhCPTA" name="supporting_material_B2,_BN5xwB8sEdqQvOjX8doCCw" guid="-ilbNOaq635vJGeb6uhCPTA" changeDate="2005-09-06T16:44:52.172-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-ilbNOaq635vJGeb6uhCPTA" name="supporting_material_B2,_BN5xwB8sEdqQvOjX8doCCw" guid="-ilbNOaq635vJGeb6uhCPTA" changeDate="2005-09-06T16:44:52.172-0700">
   <mainDescription>Supporting Material B2 Content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B1.xmi
index a1e4212..8a470a2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-ea6dw3Bj_NfpnTfl0h_7HA" name="template_B1,_C90QMB8sEdqQvOjX8doCCw" guid="-ea6dw3Bj_NfpnTfl0h_7HA" changeDate="2005-09-06T16:36:51.281-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-ea6dw3Bj_NfpnTfl0h_7HA" name="template_B1,_C90QMB8sEdqQvOjX8doCCw" guid="-ea6dw3Bj_NfpnTfl0h_7HA" changeDate="2005-09-06T16:36:51.281-0700">
   <mainDescription>Template B1 content</mainDescription>
 </org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B2.xmi
index 9ab16d9..b28e311 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/templates/template_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-TGijfkKal48g06qtjHVHJg" name="template_B2,_D-x98B8sEdqQvOjX8doCCw" guid="-TGijfkKal48g06qtjHVHJg" changeDate="2005-09-06T16:24:54.641-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-TGijfkKal48g06qtjHVHJg" name="template_B2,_D-x98B8sEdqQvOjX8doCCw" guid="-TGijfkKal48g06qtjHVHJg" changeDate="2005-09-06T16:24:54.641-0700">
   <mainDescription>Template B2 content</mainDescription>
   <attachments>resources/Template for Paste Test Cases.doc</attachments>
 </org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B1.xmi
index 34b63c6..f777ff7 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-d-5QRj7qJmzn62CE-_E6UA" name="term_definition_B1,_EpsjMB8sEdqQvOjX8doCCw" guid="-d-5QRj7qJmzn62CE-_E6UA" changeDate="2005-09-06T16:23:55.484-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-d-5QRj7qJmzn62CE-_E6UA" name="term_definition_B1,_EpsjMB8sEdqQvOjX8doCCw" guid="-d-5QRj7qJmzn62CE-_E6UA" changeDate="2005-09-06T16:23:55.484-0700">
   <mainDescription>Term Definition B1 content</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B2.xmi
index 17d6b81..2b2e6a2 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/termdefinitions/term_definition_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-pSSxtMNP5isxom1Ge9TB3g" name="term_definition_B2,_GES48B8sEdqQvOjX8doCCw" guid="-pSSxtMNP5isxom1Ge9TB3g" changeDate="2005-09-06T16:23:10.359-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-pSSxtMNP5isxom1Ge9TB3g" name="term_definition_B2,_GES48B8sEdqQvOjX8doCCw" guid="-pSSxtMNP5isxom1Ge9TB3g" changeDate="2005-09-06T16:23:10.359-0700">
   <mainDescription>&lt;p&gt;
     Term Definition B2 content
 &lt;/p&gt;</mainDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B1.xmi
index 855ddd8..d36def3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-yi0o9gkUUN06zNcCf9tWJA" name="toolmentor_B1,_GoDtUB8sEdqQvOjX8doCCw" guid="-yi0o9gkUUN06zNcCf9tWJA" changeDate="2005-09-06T16:20:34.531-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-yi0o9gkUUN06zNcCf9tWJA" name="toolmentor_B1,_GoDtUB8sEdqQvOjX8doCCw" guid="-yi0o9gkUUN06zNcCf9tWJA" changeDate="2005-09-06T16:20:34.531-0700">
   <mainDescription>Toolmentor B1 context</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B2.xmi
index 375075b..646ad6b 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/toolmentors/toolmentor_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-BvnAfGXDibcJM4d_7qWXQQ" name="toolmentor_B2,_H4OUsB8sEdqQvOjX8doCCw" guid="-BvnAfGXDibcJM4d_7qWXQQ" changeDate="2005-09-06T16:19:44.203-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-BvnAfGXDibcJM4d_7qWXQQ" name="toolmentor_B2,_H4OUsB8sEdqQvOjX8doCCw" guid="-BvnAfGXDibcJM4d_7qWXQQ" changeDate="2005-09-06T16:19:44.203-0700">
   <mainDescription>Toolmentor B2 context</mainDescription>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B1.xmi
index f214015..e00f934 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B1.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-6Cdm4S8BA4U_Va5NUoXYsw" name="whitepaper_B1,_IvD2EB8sEdqQvOjX8doCCw" guid="-6Cdm4S8BA4U_Va5NUoXYsw" changeDate="2005-09-06T16:19:07.281-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-6Cdm4S8BA4U_Va5NUoXYsw" name="whitepaper_B1,_IvD2EB8sEdqQvOjX8doCCw" guid="-6Cdm4S8BA4U_Va5NUoXYsw" changeDate="2005-09-06T16:19:07.281-0700">
   <mainDescription>Whitepaper B1 context</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B2.xmi
index e0c1f27..0661616 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/guidances/whitepapers/whitepaper_B2.xmi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-jI7NnwGFDS-zJW-jkqJdMA" name="whitepaper_B2,_JdtEwB8sEdqQvOjX8doCCw" guid="-jI7NnwGFDS-zJW-jkqJdMA" changeDate="2005-09-06T16:18:36.891-0700">
+<org.eclipse.epf.uma:GuidanceDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-jI7NnwGFDS-zJW-jkqJdMA" name="whitepaper_B2,_JdtEwB8sEdqQvOjX8doCCw" guid="-jI7NnwGFDS-zJW-jkqJdMA" changeDate="2005-09-06T16:18:36.891-0700">
   <mainDescription>Whitepaper B2 context</mainDescription>
-</org.eclipse.epf.uma:ContentDescription>
+</org.eclipse.epf.uma:GuidanceDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/plugin.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/plugin.xmi
index 5d2d359..72b33d9 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/plugin.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/plugin.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_JR6xsB8PEdqshMNSI07XOg" guid="_JR6xsB8PEdqshMNSI07XOg">
     <subManagers xmi:id="_E8miAB81EdqgBITuICLJEw" href="uma://_E6EycB81EdqgBITuICLJEw#_E8miAB81EdqgBITuICLJEw"/>
     <subManagers xmi:id="_ITCSUB81EdqgBITuICLJEw" href="uma://_IPdZ4B81EdqgBITuICLJEw#_ITCSUB81EdqgBITuICLJEw"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B1.xmi
index b34a0a2..c37121f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Fc2uYXA_47s7tRTBmmKQvQ" name="role_B1,_A9DYgB8PEdqshMNSI07XOg" guid="-Fc2uYXA_47s7tRTBmmKQvQ" changeDate="2005-09-06T12:47:23.141-0700">
+<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Fc2uYXA_47s7tRTBmmKQvQ" name="role_B1,_A9DYgB8PEdqshMNSI07XOg" guid="-Fc2uYXA_47s7tRTBmmKQvQ" changeDate="2005-09-06T12:47:23.141-0700">
   <mainDescription>Role B1 main</mainDescription>
   <keyConsiderations>Role B1 key</keyConsiderations>
   <skills>Role B1 skill</skills>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B2.xmi
index fbc4095..83a928a 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/roles/role_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-FideD01pUDUXMXEsVrs3GQ" name="role_B2,_KCM_IB8PEdqshMNSI07XOg" guid="-FideD01pUDUXMXEsVrs3GQ" changeDate="2005-09-06T12:48:21.734-0700">
+<org.eclipse.epf.uma:RoleDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-FideD01pUDUXMXEsVrs3GQ" name="role_B2,_KCM_IB8PEdqshMNSI07XOg" guid="-FideD01pUDUXMXEsVrs3GQ" changeDate="2005-09-06T12:48:21.734-0700">
   <mainDescription>Role B2 main</mainDescription>
   <keyConsiderations>Role B2 key</keyConsiderations>
   <skills>Role B2 skill</skills>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesetgroupings/role_set_grouping_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesetgroupings/role_set_grouping_B1.xmi
index 9101258..91ab3b4 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesetgroupings/role_set_grouping_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesetgroupings/role_set_grouping_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-fvsyX65ZseK2x8BNbLbplQ" name="role_set_grouping_B1,_zaVQAB8yEdqgBITuICLJEw" guid="-fvsyX65ZseK2x8BNbLbplQ" changeDate="2005-09-06T17:16:25.500-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-fvsyX65ZseK2x8BNbLbplQ" name="role_set_grouping_B1,_zaVQAB8yEdqgBITuICLJEw" guid="-fvsyX65ZseK2x8BNbLbplQ" changeDate="2005-09-06T17:16:25.500-0700">
   <mainDescription>Role Set Grouping B1 main</mainDescription>
   <keyConsiderations>Role Set Grouping B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B1.xmi
index 2c9db6e..7305417 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-NLwZpVe43A3pEv1L0nmwmA" name="role_set_B1,_uPAWcB85EdqNvelybDXZFQ" guid="-NLwZpVe43A3pEv1L0nmwmA" changeDate="2005-09-06T17:53:07.375-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-NLwZpVe43A3pEv1L0nmwmA" name="role_set_B1,_uPAWcB85EdqNvelybDXZFQ" guid="-NLwZpVe43A3pEv1L0nmwmA" changeDate="2005-09-06T17:53:07.375-0700">
   <mainDescription>Role Set B1 main</mainDescription>
   <keyConsiderations>Role Set B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B2.xmi
index 7678750..2e7cac3 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/rolesets/role_set_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-kHu3H4e_8IkDE1Iaby5qgw" name="role_set_B2,_0Y_McB85EdqNvelybDXZFQ" guid="-kHu3H4e_8IkDE1Iaby5qgw" changeDate="2005-09-06T17:53:43.547-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-kHu3H4e_8IkDE1Iaby5qgw" name="role_set_B2,_0Y_McB85EdqNvelybDXZFQ" guid="-kHu3H4e_8IkDE1Iaby5qgw" changeDate="2005-09-06T17:53:43.547-0700">
   <mainDescription>&lt;p&gt;
     Role Set B2 main
 &lt;/p&gt;</mainDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B1.xmi
index c520b0f..ab2545c 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B1.xmi
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-lYjr6VitL1VnnFNO78XuYw" name="task_B1,_XU6LUB8PEdqshMNSI07XOg" guid="-lYjr6VitL1VnnFNO78XuYw" changeDate="2005-09-06T12:50:47.203-0700">
+<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-lYjr6VitL1VnnFNO78XuYw" name="task_B1,_XU6LUB8PEdqshMNSI07XOg" guid="-lYjr6VitL1VnnFNO78XuYw" changeDate="2005-09-06T12:50:47.203-0700">
   <mainDescription>&lt;p&gt;
     Task B1 main &amp;amp; \ \\ &quot; ' % &amp;gt; &amp;lt;
 &lt;/p&gt;</mainDescription>
-  <keyConsiderations>Task B1 key</keyConsiderations>
   <sections xmi:id="_T4AqAB84EdqNvelybDXZFQ" name="Step B1.1" guid="_T4AqAB84EdqNvelybDXZFQ">
     <sectionDescription>up</sectionDescription>
   </sections>
@@ -15,6 +14,7 @@
   <sections xmi:id="_T8VJUB84EdqNvelybDXZFQ" name="Step B1.3" guid="_T8VJUB84EdqNvelybDXZFQ">
     <sectionDescription>Over</sectionDescription>
   </sections>
+  <keyConsiderations>Task B1 key</keyConsiderations>
   <purpose>Task B1 porpoise</purpose>
   <alternatives>Task B1 alt</alternatives>
 </org.eclipse.epf.uma:TaskDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B2.xmi
index 1bcb62c..a8a09af 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tasks/task_B2.xmi
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-J3z0IGfjehit0uFbTJca7g" name="task_B2,_ZLOMsB8PEdqshMNSI07XOg" guid="-J3z0IGfjehit0uFbTJca7g" changeDate="2005-09-06T12:50:07.703-0700">
+<org.eclipse.epf.uma:TaskDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-J3z0IGfjehit0uFbTJca7g" name="task_B2,_ZLOMsB8PEdqshMNSI07XOg" guid="-J3z0IGfjehit0uFbTJca7g" changeDate="2005-09-06T12:50:07.703-0700">
   <mainDescription>Task B2 main</mainDescription>
-  <keyConsiderations>Task B2 key</keyConsiderations>
   <sections xmi:id="_oqYswB84EdqNvelybDXZFQ" name="Step B2.1" guid="_oqYswB84EdqNvelybDXZFQ">
     <sectionDescription>Ein</sectionDescription>
   </sections>
@@ -15,6 +14,7 @@
     Drei
 &lt;/p&gt;</sectionDescription>
   </sections>
+  <keyConsiderations>Task B2 key</keyConsiderations>
   <purpose>Task B2 porpoise</purpose>
   <alternatives>Task B2 alt</alternatives>
 </org.eclipse.epf.uma:TaskDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B1.xmi
index 49fe197..2d6c795 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-YljEYGB4fPCE5LvT4DaPtA" name="tool_B1,_0NcvAB8yEdqgBITuICLJEw" guid="-YljEYGB4fPCE5LvT4DaPtA" changeDate="2005-09-06T17:15:29.000-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-YljEYGB4fPCE5LvT4DaPtA" name="tool_B1,_0NcvAB8yEdqgBITuICLJEw" guid="-YljEYGB4fPCE5LvT4DaPtA" changeDate="2005-09-06T17:15:29.000-0700">
   <mainDescription>Tool B1 main</mainDescription>
   <keyConsiderations>Tool B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B2.xmi
index 0c3160e..40741a5 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/tools/tool_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-3_-Aazzs_l43HOOG8DAsYw" name="tool_B2,_17HxwB8yEdqgBITuICLJEw" guid="-3_-Aazzs_l43HOOG8DAsYw" changeDate="2005-09-06T17:15:58.719-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-3_-Aazzs_l43HOOG8DAsYw" name="tool_B2,_17HxwB8yEdqgBITuICLJEw" guid="-3_-Aazzs_l43HOOG8DAsYw" changeDate="2005-09-06T17:15:58.719-0700">
   <mainDescription>Tool B2 main</mainDescription>
   <keyConsiderations>Tool B2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B1.xmi
index 4d66f9d..eca3055 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="--ugivz11L6LbjOvv53r_Tg" name="artifact_B1,_mqJ3AB8PEdqshMNSI07XOg" guid="--ugivz11L6LbjOvv53r_Tg" changeDate="2005-09-06T15:37:40.078-0700">
+<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="--ugivz11L6LbjOvv53r_Tg" name="artifact_B1,_mqJ3AB8PEdqshMNSI07XOg" guid="--ugivz11L6LbjOvv53r_Tg" changeDate="2005-09-06T15:37:40.078-0700">
   <mainDescription>Artifact B1 main</mainDescription>
   <keyConsiderations>Artifact B1 key</keyConsiderations>
   <externalId>Artifact B1 unique ID</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B2.xmi
index dd0ad3e..8e0b3db 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/artifact_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-Mjeeed_p_MQygrW7DBkArg" name="artifact_B2,__yG7cB8mEdq1Oo-DowdpBg" guid="-Mjeeed_p_MQygrW7DBkArg" changeDate="2005-09-06T15:39:04.969-0700">
+<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-Mjeeed_p_MQygrW7DBkArg" name="artifact_B2,__yG7cB8mEdq1Oo-DowdpBg" guid="-Mjeeed_p_MQygrW7DBkArg" changeDate="2005-09-06T15:39:04.969-0700">
   <mainDescription>Artifact B2 main</mainDescription>
   <keyConsiderations>Artifact B2 key</keyConsiderations>
   <externalId>Artifact B2 unique ID</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B1.xmi
index bfa4d60..eb9b5de 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-gufx4RaFwhiUhhBkoq3vZg" name="deliverable_B1,_ZHf2YB8nEdq1Oo-DowdpBg" guid="-gufx4RaFwhiUhhBkoq3vZg" changeDate="2005-09-06T15:42:14.781-0700">
+<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-gufx4RaFwhiUhhBkoq3vZg" name="deliverable_B1,_ZHf2YB8nEdq1Oo-DowdpBg" guid="-gufx4RaFwhiUhhBkoq3vZg" changeDate="2005-09-06T15:42:14.781-0700">
   <mainDescription>Deliverable B1 main</mainDescription>
   <keyConsiderations>Deliverable B1 key</keyConsiderations>
   <externalId>Deliverable B1 unique ID</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B2.xmi
index 1556a70..b10db42 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/deliverable_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-KxNsFwg9cN4-1s5bs3xZIg" name="deliverable_B2,_nqFWEB8nEdq1Oo-DowdpBg" guid="-KxNsFwg9cN4-1s5bs3xZIg" changeDate="2005-09-06T15:43:30.562-0700">
+<org.eclipse.epf.uma:DeliverableDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-KxNsFwg9cN4-1s5bs3xZIg" name="deliverable_B2,_nqFWEB8nEdq1Oo-DowdpBg" guid="-KxNsFwg9cN4-1s5bs3xZIg" changeDate="2005-09-06T15:43:30.562-0700">
   <mainDescription>Deliverable B2 main</mainDescription>
   <keyConsiderations>Deliverable B2 key</keyConsiderations>
   <externalId>Deliverable B2 unique ID</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B1.xmi
index f1225ce..0615617 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-ybTPuVO4RGwn_wQlvAWaaw" name="outcome_B1,_cXXrsB8nEdq1Oo-DowdpBg" guid="-ybTPuVO4RGwn_wQlvAWaaw" changeDate="2005-09-06T15:47:38.109-0700">
+<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-ybTPuVO4RGwn_wQlvAWaaw" name="outcome_B1,_cXXrsB8nEdq1Oo-DowdpBg" guid="-ybTPuVO4RGwn_wQlvAWaaw" changeDate="2005-09-06T15:47:38.109-0700">
   <mainDescription>Outcome B1 main</mainDescription>
   <keyConsiderations>Outcome B1 key</keyConsiderations>
   <externalId>Outcome B1 unique ID</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B2.xmi
index 39ec8d3..9bad46f 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducts/outcome_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-HNXLH1Hgdn72WXG77AHGZA" name="outcome_B2,_asFOkB8nEdq1Oo-DowdpBg" guid="-HNXLH1Hgdn72WXG77AHGZA" changeDate="2005-09-06T15:46:01.156-0700">
+<org.eclipse.epf.uma:WorkProductDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-HNXLH1Hgdn72WXG77AHGZA" name="outcome_B2,_asFOkB8nEdq1Oo-DowdpBg" guid="-HNXLH1Hgdn72WXG77AHGZA" changeDate="2005-09-06T15:46:01.156-0700">
   <mainDescription>Outcome B2 main</mainDescription>
   <keyConsiderations>Outcome B2 key</keyConsiderations>
   <externalId>Outcome B2 unique ID</externalId>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B1.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B1.xmi
index 97388c5..df16636 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B1.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B1.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-fh8Xo9IIq2FZyDdp1eidog" name="work_product_type_B1,_xKsIoB8yEdqgBITuICLJEw" guid="-fh8Xo9IIq2FZyDdp1eidog" changeDate="2005-09-06T17:17:28.484-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-fh8Xo9IIq2FZyDdp1eidog" name="work_product_type_B1,_xKsIoB8yEdqgBITuICLJEw" guid="-fh8Xo9IIq2FZyDdp1eidog" changeDate="2005-09-06T17:17:28.484-0700">
   <mainDescription>Work Product Type B1 main</mainDescription>
   <keyConsiderations>Work Product Type B1 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B2.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B2.xmi
index 33c9401..64f5bd1 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B2.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/Plug B/workproducttypes/work_product_type_B2.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="-KoUnu2bL_F_O_30Sd5PJ9w" name="work_product_type_B2,_yCkL0B8yEdqgBITuICLJEw" guid="-KoUnu2bL_F_O_30Sd5PJ9w" changeDate="2005-09-06T17:04:55.766-0700">
+<org.eclipse.epf.uma:ContentDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="-KoUnu2bL_F_O_30Sd5PJ9w" name="work_product_type_B2,_yCkL0B8yEdqgBITuICLJEw" guid="-KoUnu2bL_F_O_30Sd5PJ9w" changeDate="2005-09-06T17:04:55.766-0700">
   <mainDescription>Work Product Type B2 main</mainDescription>
   <keyConsiderations>Work Product Type B2 key</keyConsiderations>
 </org.eclipse.epf.uma:ContentDescription>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config A.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config A.xmi
index 13ce08c..e372dce 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config A.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config A.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="_rrmCIBAdEdq7Frc_yMhQ-A" name="Config A" guid="_rrmCIBAdEdq7Frc_yMhQ-A" briefDescription="Config A description">
+<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="_rrmCIBAdEdq7Frc_yMhQ-A" name="Config A" guid="_rrmCIBAdEdq7Frc_yMhQ-A" briefDescription="Config A description">
   <methodPluginSelection href="uma://_yUeLIA-PEdqL2O1PJV9cZA#_yUeLIA-PEdqL2O1PJV9cZA"/>
   <methodPluginSelection href="uma://_ecy5wBM3Edqqndi-gDuxpw#_ecy5wBM3Edqqndi-gDuxpw"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_yUeLIA-PEdqL2O1PJV9cZA#_yUeLLA-PEdqL2O1PJV9cZA"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config B.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config B.xmi
index b1f4027..9fe7b57 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config B.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/Config B.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="_ULqBIBM3Edqqndi-gDuxpw" name="Config B" guid="_ULqBIBM3Edqqndi-gDuxpw">
+<org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="_ULqBIBM3Edqqndi-gDuxpw" name="Config B" guid="_ULqBIBM3Edqqndi-gDuxpw">
   <methodPluginSelection href="uma://_ecy5wBM3Edqqndi-gDuxpw#_ecy5wBM3Edqqndi-gDuxpw"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_ecy5wBM3Edqqndi-gDuxpw#_ecy5zBM3Edqqndi-gDuxpw"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_ecy5wBM3Edqqndi-gDuxpw#_ecy5wRM3Edqqndi-gDuxpw"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/proc_Family_A.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/proc_Family_A.xmi
index b8b67d5..170b9b1 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/proc_Family_A.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/configurations/proc_Family_A.xmi
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ProcessFamily xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" epf:version="1.0.0" xmi:id="_YUiAAB81EdqgBITuICLJEw" name="proc_Family_A" guid="_YUiAAB81EdqgBITuICLJEw" briefDescription="proc_Family_A description"/>
+<org.eclipse.epf.uma:ProcessFamily xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0" xmi:id="_YUiAAB81EdqgBITuICLJEw" name="proc_Family_A" guid="_YUiAAB81EdqgBITuICLJEw" briefDescription="proc_Family_A description"/>
diff --git a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/library.xmi b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/library.xmi
index 443a123..d74cb11 100644
--- a/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/library.xmi
+++ b/org.eclipse.epf.library.tests/Libraries/1.0.0/ExportImport/Paris/library.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.3/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" epf:version="1.0.0">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.4/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.2.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_qzwywQ-PEdqL2O1PJV9cZA" guid="_qzwywQ-PEdqL2O1PJV9cZA">
     <subManagers xmi:id="_6lK2AA-PEdqL2O1PJV9cZA" href="uma://_yUeLIA-PEdqL2O1PJV9cZA#_6lK2AA-PEdqL2O1PJV9cZA"/>
     <subManagers xmi:id="_JR6xsB8PEdqshMNSI07XOg" href="uma://_ecy5wBM3Edqqndi-gDuxpw#_JR6xsB8PEdqshMNSI07XOg"/>