143 files changed, 4151 insertions, 2431 deletions

diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.notation
index 846312d60c8..5e29d8e4919 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.notation
@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"

-    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"

-    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"

-    name="ClassTreeTable0"

-    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"

-    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle"

-      xmi:id="_6gzOoHucEeSTu_GUJ96b9g"

-      name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype

-      xmi:type="configuration:PapyrusSyncTable"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration

-      xmi:type="nattableconfiguration:TableConfiguration"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory

-      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"

-      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"

-      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"

-      name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory

-      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"

-      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"

-      description="This axis provider manages the rows, according to the wanted hierarchy"

-      name="HierarchicalRowaAxisManager"

-      disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration

-      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"

-      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"

-      indexStyle="NUMERIC">

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"

-        pasteConfiguration="__7v3wHvFEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"

-        pasteConfiguration="__7we0HvFEeSOIP1uah0_EA"

-        depth="2"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="__7v3wHvFEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="__7we0HvFEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations

-        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"

-        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"

-        localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"
+    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"
+    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"
+    name="ClassTreeTable0"
+    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"
+    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle"
+      xmi:id="_6gzOoHucEeSTu_GUJ96b9g"
+      name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype
+      xmi:type="configuration:PapyrusSyncTable"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration
+      xmi:type="nattableconfiguration:TableConfiguration"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory
+      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"
+      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"
+      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"
+      name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory
+      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"
+      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"
+      description="This axis provider manages the rows, according to the wanted hierarchy"
+      name="HierarchicalRowaAxisManager"
+      disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration
+      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"
+      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"
+      indexStyle="NUMERIC">
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"
+        pasteConfiguration="__7v3wHvFEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"
+        pasteConfiguration="__7we0HvFEeSOIP1uah0_EA"
+        depth="2"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="__7v3wHvFEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="__7we0HvFEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations
+        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"
+        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"
+        localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.txt
index 49f1abb1701..5057db0eefa 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.txt
@@ -1,26 +1,26 @@
-Class0			Class0	public	false	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

-Class1			Class1	public	false	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

+Class0			Class0	public	false	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
+Class1			Class1	public	false	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.notation
index 220537045a6..692a841bd93 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.notation
@@ -1,147 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"

-    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"

-    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"

-    name="ClassTreeTable0"

-    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"

-    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle"

-      xmi:id="_6gzOoHucEeSTu_GUJ96b9g"

-      name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-  </styles>

-  <context xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype

-      xmi:type="configuration:PapyrusSyncTable"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration

-      xmi:type="nattableconfiguration:TableConfiguration"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory

-      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"

-      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"

-      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"

-      name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory

-      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"

-      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"

-      description="This axis provider manages the rows, according to the wanted hierarchy"

-      name="HierarchicalRowaAxisManager"

-      disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration

-      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"

-      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"

-      indexStyle="NUMERIC">

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"

-        pasteConfiguration="__7v3wHvFEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"

-        pasteConfiguration="__7we0HvFEeSOIP1uah0_EA"

-        depth="2"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="__7v3wHvFEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="__7we0HvFEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations

-        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"

-        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"

-        localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"
+    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"
+    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"
+    name="ClassTreeTable0"
+    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"
+    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle"
+      xmi:id="_6gzOoHucEeSTu_GUJ96b9g"
+      name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <context xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype
+      xmi:type="configuration:PapyrusSyncTable"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration
+      xmi:type="nattableconfiguration:TableConfiguration"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory
+      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"
+      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"
+      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"
+      name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory
+      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"
+      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"
+      description="This axis provider manages the rows, according to the wanted hierarchy"
+      name="HierarchicalRowaAxisManager"
+      disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration
+      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"
+      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"
+      indexStyle="NUMERIC">
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"
+        pasteConfiguration="__7v3wHvFEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"
+        pasteConfiguration="__7we0HvFEeSOIP1uah0_EA"
+        depth="2"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="__7v3wHvFEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="__7we0HvFEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations
+        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"
+        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"
+        localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.txt
index 254e52f625d..b6b139e8c74 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.txt
@@ -1,33 +1,33 @@
-Class0				Class0	public	false	N/A

-	Operation0			Operation0	package	false	N/A

-		ownedParameter					

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-	Operation1			Operation1	package	false	

-		ownedParameter					

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-	Operation2			Operation2	package	false	

-		ownedParameter					

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-Class1				Class1	public	false	N/A

-	Operation0			Operation0	package	false	N/A

-		ownedParameter					

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-	Operation1			Operation1	package	false	

-		ownedParameter					

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-	Operation2			Operation2	package	false	

-		ownedParameter					

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-

+Class0				Class0	public	false	N/A
+	Operation0			Operation0	package	false	N/A
+		ownedParameter					
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+	Operation1			Operation1	package	false	
+		ownedParameter					
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+	Operation2			Operation2	package	false	
+		ownedParameter					
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+Class1				Class1	public	false	N/A
+	Operation0			Operation0	package	false	N/A
+		ownedParameter					
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+	Operation1			Operation1	package	false	
+		ownedParameter					
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+	Operation2			Operation2	package	false	
+		ownedParameter					
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.notation
index 29805a267f1..aec8ff2ab75 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.notation
@@ -1,197 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"

-    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"

-    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"

-    name="ClassTreeTable0"

-    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"

-    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle"

-      xmi:id="_KJpacHxbEeSxVJAGQ_SozA"

-      name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-  </styles>

-  <context xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype

-      xmi:type="configuration:PapyrusSyncTable"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration

-      xmi:type="nattableconfiguration:TableConfiguration"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory

-      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"

-      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"

-      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"

-      name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory

-      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"

-      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"

-      description="This axis provider manages the rows, according to the wanted hierarchy"

-      name="HierarchicalRowaAxisManager"

-      disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration

-      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"

-      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"

-      indexStyle="NUMERIC">

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_Uchc4Hu1EeSOIP1uah0_EA"

-        pasteConfiguration="_3W0-cHvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_Uchc4Xu1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"

-        pasteConfiguration="_3W0-cXvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_Uchc4nu1EeSOIP1uah0_EA"

-        pasteConfiguration="_3W0-cnvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_Uchc43u1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"

-        pasteConfiguration="_3W0-c3vHEeSOIP1uah0_EA"

-        depth="2"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3W0-cHvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Property">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3W0-cXvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3W0-cnvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3W0-c3vHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations

-        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"

-        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"

-        localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"
+    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"
+    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"
+    name="ClassTreeTable0"
+    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"
+    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle"
+      xmi:id="_KJpacHxbEeSxVJAGQ_SozA"
+      name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <context xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype
+      xmi:type="configuration:PapyrusSyncTable"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration
+      xmi:type="nattableconfiguration:TableConfiguration"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory
+      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"
+      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"
+      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"
+      name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory
+      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"
+      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"
+      description="This axis provider manages the rows, according to the wanted hierarchy"
+      name="HierarchicalRowaAxisManager"
+      disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration
+      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"
+      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"
+      indexStyle="NUMERIC">
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_Uchc4Hu1EeSOIP1uah0_EA"
+        pasteConfiguration="_3W0-cHvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_Uchc4Xu1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"
+        pasteConfiguration="_3W0-cXvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_Uchc4nu1EeSOIP1uah0_EA"
+        pasteConfiguration="_3W0-cnvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_Uchc43u1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"
+        pasteConfiguration="_3W0-c3vHEeSOIP1uah0_EA"
+        depth="2"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3W0-cHvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3W0-cXvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3W0-cnvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3W0-c3vHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations
+        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"
+        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"
+        localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.txt
index 0260423550c..f28b0cb5fbb 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.txt
@@ -1,44 +1,44 @@
-Class0				Class0	public	false	N/A

-	Property0			Property0	protected	true	N/A

-	Property1			Property1	protected	true	N/A

-	Property2			Property2	protected	true	N/A

-	NestedClass0			NestedClass0	private	true	N/A

-	NestedClass1			NestedClass1	private	true	N/A

-	NestedClass2			NestedClass2	private	true	N/A

-	Operation0			Operation0	package	false	N/A

-		ownedParameter					

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-	Operation1			Operation1	package	false	

-		ownedParameter					

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-	Operation2			Operation2	package	false	

-		ownedParameter					

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-Class1				Class1	public	false	N/A

-	Property0			Property0	protected	true	N/A

-	Property1			Property1	protected	true	N/A

-	Property2			Property2	protected	true	N/A

-	NestedClass0			NestedClass0	private	true	N/A

-	NestedClass1			NestedClass1	private	true	N/A

-	NestedClass2			NestedClass2	private	true	N/A

-	Operation0			Operation0	package	false	N/A

-		ownedParameter					

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-	Operation1			Operation1	package	false	

-		ownedParameter					

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-	Operation2			Operation2	package	false	

-		ownedParameter					

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

+Class0				Class0	public	false	N/A
+	Property0			Property0	protected	true	N/A
+	Property1			Property1	protected	true	N/A
+	Property2			Property2	protected	true	N/A
+	NestedClass0			NestedClass0	private	true	N/A
+	NestedClass1			NestedClass1	private	true	N/A
+	NestedClass2			NestedClass2	private	true	N/A
+	Operation0			Operation0	package	false	N/A
+		ownedParameter					
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+	Operation1			Operation1	package	false	
+		ownedParameter					
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+	Operation2			Operation2	package	false	
+		ownedParameter					
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+Class1				Class1	public	false	N/A
+	Property0			Property0	protected	true	N/A
+	Property1			Property1	protected	true	N/A
+	Property2			Property2	protected	true	N/A
+	NestedClass0			NestedClass0	private	true	N/A
+	NestedClass1			NestedClass1	private	true	N/A
+	NestedClass2			NestedClass2	private	true	N/A
+	Operation0			Operation0	package	false	N/A
+		ownedParameter					
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+	Operation1			Operation1	package	false	
+		ownedParameter					
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+	Operation2			Operation2	package	false	
+		ownedParameter					
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.notation
index 085d7d9051d..ee6f22b2c90 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.notation
@@ -1,197 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"

-    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"

-    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"

-    name="ClassTreeTable0"

-    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"

-    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle"

-      xmi:id="_6gzOoHucEeSTu_GUJ96b9g"

-      name="hiddenCategoriesByDepth">

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype

-      xmi:type="configuration:PapyrusSyncTable"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration

-      xmi:type="nattableconfiguration:TableConfiguration"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory

-      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"

-      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"

-      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"

-      name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory

-      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"

-      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"

-      description="This axis provider manages the rows, according to the wanted hierarchy"

-      name="HierarchicalRowaAxisManager"

-      disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration

-      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"

-      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"

-      indexStyle="NUMERIC">

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_GOQnYHu1EeSOIP1uah0_EA"

-        pasteConfiguration="_zqX60HvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_GOQnYXu1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"

-        pasteConfiguration="_zqX60XvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_GOQnYnu1EeSOIP1uah0_EA"

-        pasteConfiguration="_zqX60nvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_GOQnY3u1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"

-        pasteConfiguration="_zqX603vHEeSOIP1uah0_EA"

-        depth="2"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_zqX60HvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Property">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_zqX60XvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_zqX60nvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_zqX603vHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations

-        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"

-        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"

-        localSpecificConfigurations="_GOQnYHu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _GOQnYnu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"
+    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"
+    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"
+    name="ClassTreeTable0"
+    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"
+    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle"
+      xmi:id="_6gzOoHucEeSTu_GUJ96b9g"
+      name="hiddenCategoriesByDepth">
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype
+      xmi:type="configuration:PapyrusSyncTable"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration
+      xmi:type="nattableconfiguration:TableConfiguration"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory
+      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"
+      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"
+      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"
+      name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory
+      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"
+      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"
+      description="This axis provider manages the rows, according to the wanted hierarchy"
+      name="HierarchicalRowaAxisManager"
+      disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration
+      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"
+      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"
+      indexStyle="NUMERIC">
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_GOQnYHu1EeSOIP1uah0_EA"
+        pasteConfiguration="_zqX60HvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_GOQnYXu1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"
+        pasteConfiguration="_zqX60XvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_GOQnYnu1EeSOIP1uah0_EA"
+        pasteConfiguration="_zqX60nvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_GOQnY3u1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"
+        pasteConfiguration="_zqX603vHEeSOIP1uah0_EA"
+        depth="2"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_zqX60HvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_zqX60XvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_zqX60nvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_zqX603vHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations
+        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"
+        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"
+        localSpecificConfigurations="_GOQnYHu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _GOQnYnu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.txt
index 3b850d48489..395da98bce7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.txt
@@ -1,44 +1,44 @@
-Class0				Class0	public	false	N/A

-	ownedAttribute						

-		Property0		Property0	protected	true	N/A

-		Property1		Property1	protected	true	N/A

-		Property2		Property2	protected	true	N/A

-	nestedClassifier						

-		NestedClass0		NestedClass0	private	true	N/A

-		NestedClass1		NestedClass1	private	true	N/A

-		NestedClass2		NestedClass2	private	true	N/A

-	ownedOperation						

-		Operation0		Operation0	package	false	N/A

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-		Operation1		Operation1	package	false	

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-		Operation2		Operation2	package	false	

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-Class1				Class1	public	false	N/A

-	ownedAttribute						

-		Property0		Property0	protected	true	N/A

-		Property1		Property1	protected	true	N/A

-		Property2		Property2	protected	true	N/A

-	nestedClassifier						

-		NestedClass0		NestedClass0	private	true	N/A

-		NestedClass1		NestedClass1	private	true	N/A

-		NestedClass2		NestedClass2	private	true	N/A

-	ownedOperation						

-		Operation0		Operation0	package	false	N/A

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-		Operation1		Operation1	package	false	

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-		Operation2		Operation2	package	false	

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

+Class0				Class0	public	false	N/A
+	ownedAttribute						
+		Property0		Property0	protected	true	N/A
+		Property1		Property1	protected	true	N/A
+		Property2		Property2	protected	true	N/A
+	nestedClassifier						
+		NestedClass0		NestedClass0	private	true	N/A
+		NestedClass1		NestedClass1	private	true	N/A
+		NestedClass2		NestedClass2	private	true	N/A
+	ownedOperation						
+		Operation0		Operation0	package	false	N/A
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+		Operation1		Operation1	package	false	
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+		Operation2		Operation2	package	false	
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+Class1				Class1	public	false	N/A
+	ownedAttribute						
+		Property0		Property0	protected	true	N/A
+		Property1		Property1	protected	true	N/A
+		Property2		Property2	protected	true	N/A
+	nestedClassifier						
+		NestedClass0		NestedClass0	private	true	N/A
+		NestedClass1		NestedClass1	private	true	N/A
+		NestedClass2		NestedClass2	private	true	N/A
+	ownedOperation						
+		Operation0		Operation0	package	false	N/A
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+		Operation1		Operation1	package	false	
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+		Operation2		Operation2	package	false	
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.notation
index a3dee3ac020..083779682ed 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.notation
@@ -1,191 +1,191 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"

-    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider"

-    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"

-    name="ClassTreeTable0"

-    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"

-    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <context xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model"

-      href="PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype

-      xmi:type="configuration:PapyrusSyncTable"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration

-      xmi:type="nattableconfiguration:TableConfiguration"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory

-      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"

-      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"

-      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"

-      name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory

-      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"

-      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"

-      description="This axis provider manages the rows, according to the wanted hierarchy"

-      name="HierarchicalRowaAxisManager"

-      disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration

-      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"

-      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"

-      indexStyle="NUMERIC">

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_Uchc4Hu1EeSOIP1uah0_EA"

-        pasteConfiguration="_ujT6YHvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_Uchc4Xu1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"

-        pasteConfiguration="_ujT6YXvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_Uchc4nu1EeSOIP1uah0_EA"

-        pasteConfiguration="_ujT6YnvHEeSOIP1uah0_EA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_Uchc43u1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"

-        pasteConfiguration="_ujT6Y3vHEeSOIP1uah0_EA"

-        depth="2"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_ujT6YHvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Property">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_ujT6YXvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_ujT6YnvHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_ujT6Y3vHEeSOIP1uah0_EA"

-        pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations

-        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"

-        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"

-        localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"
+    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider"
+    xmi:id="_zDRtIHucEeSTu_GUJ96b9g"
+    name="ClassTreeTable0"
+    currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g"
+    currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <context xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model"
+      href="PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype
+      xmi:type="configuration:PapyrusSyncTable"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration
+      xmi:type="nattableconfiguration:TableConfiguration"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory
+      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"
+      xmi:id="_zDRtIXucEeSTu_GUJ96b9g"
+      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"
+      name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory
+      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"
+      xmi:id="_zDRtI3ucEeSTu_GUJ96b9g"
+      description="This axis provider manages the rows, according to the wanted hierarchy"
+      name="HierarchicalRowaAxisManager"
+      disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration
+      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"
+      xmi:id="_0T5ngHucEeSTu_GUJ96b9g"
+      indexStyle="NUMERIC">
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_Uchc4Hu1EeSOIP1uah0_EA"
+        pasteConfiguration="_ujT6YHvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_Uchc4Xu1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g"
+        pasteConfiguration="_ujT6YXvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_Uchc4nu1EeSOIP1uah0_EA"
+        pasteConfiguration="_ujT6YnvHEeSOIP1uah0_EA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_Uchc43u1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_0T6OlXucEeSTu_GUJ96b9g"
+        pasteConfiguration="_ujT6Y3vHEeSOIP1uah0_EA"
+        depth="2"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_ujT6YHvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_ujT6YXvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_ujT6YnvHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_ujT6Y3vHEeSOIP1uah0_EA"
+        pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations
+        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"
+        xmi:id="_0T6OkHucEeSTu_GUJ96b9g"
+        localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.txt
index d1e6efa74e2..f50144bab53 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.txt
@@ -1,50 +1,50 @@
-Class0					Class0	public	false	N/A

-	ownedAttribute							

-		Property0			Property0	protected	true	N/A

-		Property1			Property1	protected	true	N/A

-		Property2			Property2	protected	true	N/A

-	nestedClassifier							

-		NestedClass0			NestedClass0	private	true	N/A

-		NestedClass1			NestedClass1	private	true	N/A

-		NestedClass2			NestedClass2	private	true	N/A

-	ownedOperation							

-		Operation0			Operation0	package	false	N/A

-			ownedParameter					

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-		Operation1			Operation1	package	false	

-			ownedParameter					

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-		Operation2			Operation2	package	false	

-			ownedParameter					

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

-Class1					Class1	public	false	N/A

-	ownedAttribute							

-		Property0			Property0	protected	true	N/A

-		Property1			Property1	protected	true	N/A

-		Property2			Property2	protected	true	N/A

-	nestedClassifier							

-		NestedClass0			NestedClass0	private	true	N/A

-		NestedClass1			NestedClass1	private	true	N/A

-		NestedClass2			NestedClass2	private	true	N/A

-	ownedOperation							

-		Operation0			Operation0	package	false	N/A

-			ownedParameter					

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-		Operation1			Operation1	package	false	

-			ownedParameter					

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-		Operation2			Operation2	package	false	

-			ownedParameter					

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

+Class0					Class0	public	false	N/A
+	ownedAttribute							
+		Property0			Property0	protected	true	N/A
+		Property1			Property1	protected	true	N/A
+		Property2			Property2	protected	true	N/A
+	nestedClassifier							
+		NestedClass0			NestedClass0	private	true	N/A
+		NestedClass1			NestedClass1	private	true	N/A
+		NestedClass2			NestedClass2	private	true	N/A
+	ownedOperation							
+		Operation0			Operation0	package	false	N/A
+			ownedParameter					
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+		Operation1			Operation1	package	false	
+			ownedParameter					
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+		Operation2			Operation2	package	false	
+			ownedParameter					
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
+Class1					Class1	public	false	N/A
+	ownedAttribute							
+		Property0			Property0	protected	true	N/A
+		Property1			Property1	protected	true	N/A
+		Property2			Property2	protected	true	N/A
+	nestedClassifier							
+		NestedClass0			NestedClass0	private	true	N/A
+		NestedClass1			NestedClass1	private	true	N/A
+		NestedClass2			NestedClass2	private	true	N/A
+	ownedOperation							
+		Operation0			Operation0	package	false	N/A
+			ownedParameter					
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+		Operation1			Operation1	package	false	
+			ownedParameter					
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+		Operation2			Operation2	package	false	
+			ownedParameter					
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.notation
index 0e3f1d363e3..dec9d1d5808 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.notation
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">

-    <intListValue>0</intListValue>

-    <intListValue>1</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-     <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+     <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.txt
index 49f1abb1701..5057db0eefa 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.txt
@@ -1,26 +1,26 @@
-Class0			Class0	public	false	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

-Class1			Class1	public	false	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

+Class0			Class0	public	false	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
+Class1			Class1	public	false	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.notation
index 1dc74c2e3c2..53d9038b329 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.notation
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">

-    <intListValue>0</intListValue>

-    <intListValue>1</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>1</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.txt
index 1aa4f4620f9..b2308ec0a44 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.txt
@@ -1,32 +1,32 @@
-Class0				Class0	public	false	N/A

-	Operation0			Operation0	package	false	N/A

-		ownedParameter					

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-	Operation1			Operation1	package	false	

-		ownedParameter					

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-	Operation2			Operation2	package	false	

-		ownedParameter					

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-Class1				Class1	public	false	N/A

-	Operation0			Operation0	package	false	N/A

-		ownedParameter					

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-	Operation1			Operation1	package	false	

-		ownedParameter					

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-	Operation2			Operation2	package	false	

-		ownedParameter					

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

+Class0				Class0	public	false	N/A
+	Operation0			Operation0	package	false	N/A
+		ownedParameter					
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+	Operation1			Operation1	package	false	
+		ownedParameter					
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+	Operation2			Operation2	package	false	
+		ownedParameter					
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+Class1				Class1	public	false	N/A
+	Operation0			Operation0	package	false	N/A
+		ownedParameter					
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+	Operation1			Operation1	package	false	
+		ownedParameter					
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+	Operation2			Operation2	package	false	
+		ownedParameter					
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.notation
index 6daa84d6061..fcac9987f19 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.notation
@@ -1,224 +1,224 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"

-    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"

-    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

-    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

-    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"

-    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

-    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"

-    xmi:id="_Yk1o8GZzEeSDCaDFwPGYVw"

-    name="ClassTreeTable0"

-    currentRowAxisProvider="_Yk1o82ZzEeSDCaDFwPGYVw"

-    currentColumnAxisProvider="_Yk1o8WZzEeSDCaDFwPGYVw">

-  <styles xmi:type="nattablestyle:IntListValueStyle"

-      xmi:id="_PCk74HcDEeSihK466TsMPg"

-      name="hiddenCategoriesByDepth">

-    <intListValue>0</intListValue>

-    <intListValue>1</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model"

-      href="PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>

-  <owner xmi:type="uml:Model"

-      href="PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>

-  <prototype

-      xmi:type="configuration:PapyrusSyncTable"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration

-      xmi:type="nattableconfiguration:TableConfiguration"

-      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory

-      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"

-      xmi:id="_Yk1o8WZzEeSDCaDFwPGYVw"

-      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"

-      name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"

-        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element

-          xmi:type="ecore:EAttribute"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory

-      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"

-      xmi:id="_Yk1o82ZzEeSDCaDFwPGYVw"

-      description="This axis provider manages the rows, according to the wanted hierarchy"

-      name="HierarchicalRowaAxisManager"

-      disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration

-      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"

-      xmi:id="_53PFMG5fEeSSk_Uaj9vcpQ"

-      indexStyle="NUMERIC"

-      displayIndex="false">

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_BU9nQXcBEeSihK466TsMPg"

-        pasteConfiguration="_3ExscHyIEeSxVJAGQ_SozA"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_BU9nQncBEeSihK466TsMPg">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_BU9nQ3cBEeSihK466TsMPg"

-        pasteConfiguration="_3ExscXyIEeSxVJAGQ_SozA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_BU9nRHcBEeSihK466TsMPg">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_BU9nRXcBEeSihK466TsMPg"

-        pasteConfiguration="_3ExscnyIEeSxVJAGQ_SozA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_BU9nRncBEeSihK466TsMPg">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_BU9nR3cBEeSihK466TsMPg"

-        pasteConfiguration="_3Exsc3yIEeSxVJAGQ_SozA"

-        depth="1"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_BU9nSHcBEeSihK466TsMPg">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"

-        xmi:id="_er6pEHu1EeSOIP1uah0_EA"

-        pasteConfiguration="_3ExsdHyIEeSxVJAGQ_SozA"

-        depth="2"

-        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider

-          xmi:type="nattableaxis:EStructuralFeatureAxis"

-          xmi:id="_er6pEXu1EeSOIP1uah0_EA">

-        <element

-            xmi:type="ecore:EReference"

-            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider

-          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3ExscHyIEeSxVJAGQ_SozA"

-        pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3ExscXyIEeSxVJAGQ_SozA"

-        pastedElementId="org.eclipse.papyrus.uml.Property">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3ExscnyIEeSxVJAGQ_SozA"

-        pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3Exsc3yIEeSxVJAGQ_SozA"

-        pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations

-        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"

-        xmi:id="_3ExsdHyIEeSxVJAGQ_SozA"

-        pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature

-          xmi:type="ecore:EReference"

-          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations

-        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"

-        xmi:id="_BU9nQHcBEeSihK466TsMPg"

-        localSpecificConfigurations="_BU9nQXcBEeSihK466TsMPg _BU9nQ3cBEeSihK466TsMPg _BU9nRXcBEeSihK466TsMPg _BU9nR3cBEeSihK466TsMPg _er6pEHu1EeSOIP1uah0_EA">

-      <axisManager

-          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"

-          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model"
+    xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
+    xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
+    xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
+    xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
+    xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
+    xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"
+    xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
+    xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle"
+    xmi:id="_Yk1o8GZzEeSDCaDFwPGYVw"
+    name="ClassTreeTable0"
+    currentRowAxisProvider="_Yk1o82ZzEeSDCaDFwPGYVw"
+    currentColumnAxisProvider="_Yk1o8WZzEeSDCaDFwPGYVw">
+  <styles xmi:type="nattablestyle:IntListValueStyle"
+      xmi:id="_PCk74HcDEeSihK466TsMPg"
+      name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model"
+      href="PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <owner xmi:type="uml:Model"
+      href="PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <prototype
+      xmi:type="configuration:PapyrusSyncTable"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration
+      xmi:type="nattableconfiguration:TableConfiguration"
+      href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory
+      xmi:type="nattableaxisprovider:SlaveObjectAxisProvider"
+      xmi:id="_Yk1o8WZzEeSDCaDFwPGYVw"
+      description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)"
+      name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis"
+        xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element
+          xmi:type="ecore:EAttribute"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory
+      xmi:type="nattableaxisprovider:MasterObjectAxisProvider"
+      xmi:id="_Yk1o82ZzEeSDCaDFwPGYVw"
+      description="This axis provider manages the rows, according to the wanted hierarchy"
+      name="HierarchicalRowaAxisManager"
+      disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration
+      xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration"
+      xmi:id="_53PFMG5fEeSSk_Uaj9vcpQ"
+      indexStyle="NUMERIC"
+      displayIndex="false">
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_BU9nQXcBEeSihK466TsMPg"
+        pasteConfiguration="_3ExscHyIEeSxVJAGQ_SozA"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_BU9nQncBEeSihK466TsMPg">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_BU9nQ3cBEeSihK466TsMPg"
+        pasteConfiguration="_3ExscXyIEeSxVJAGQ_SozA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_BU9nRHcBEeSihK466TsMPg">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_BU9nRXcBEeSihK466TsMPg"
+        pasteConfiguration="_3ExscnyIEeSxVJAGQ_SozA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_BU9nRncBEeSihK466TsMPg">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_BU9nR3cBEeSihK466TsMPg"
+        pasteConfiguration="_3Exsc3yIEeSxVJAGQ_SozA"
+        depth="1"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_BU9nSHcBEeSihK466TsMPg">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:TreeFillingConfiguration"
+        xmi:id="_er6pEHu1EeSOIP1uah0_EA"
+        pasteConfiguration="_3ExsdHyIEeSxVJAGQ_SozA"
+        depth="2"
+        labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider
+          xmi:type="nattableaxis:EStructuralFeatureAxis"
+          xmi:id="_er6pEXu1EeSOIP1uah0_EA">
+        <element
+            xmi:type="ecore:EReference"
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider
+          xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3ExscHyIEeSxVJAGQ_SozA"
+        pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3ExscXyIEeSxVJAGQ_SozA"
+        pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3ExscnyIEeSxVJAGQ_SozA"
+        pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3Exsc3yIEeSxVJAGQ_SozA"
+        pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations
+        xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration"
+        xmi:id="_3ExsdHyIEeSxVJAGQ_SozA"
+        pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature
+          xmi:type="ecore:EReference"
+          href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations
+        xmi:type="nattableaxisconfiguration:AxisManagerConfiguration"
+        xmi:id="_BU9nQHcBEeSihK466TsMPg"
+        localSpecificConfigurations="_BU9nQXcBEeSihK466TsMPg _BU9nQ3cBEeSihK466TsMPg _BU9nRXcBEeSihK466TsMPg _BU9nR3cBEeSihK466TsMPg _er6pEHu1EeSOIP1uah0_EA">
+      <axisManager
+          xmi:type="nattableaxisconfiguration:AxisManagerRepresentation"
+          href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.txt
index 5b1715b9916..3272a13ea11 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.txt
@@ -1,38 +1,38 @@
-Class0			Class0	public	false	N/A

-	Propertyerty0		Property0	protected	true	N/A

-	Property1		Property1	protected	true	N/A

-	Property2		Property2	protected	true	N/A

-	NestedClass0		NestedClass0	private	true	N/A

-	NestedClass1		NestedClass1	private	true	N/A

-	NestedClass2		NestedClass2	private	true	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

-Class0			Class0	public	false	N/A

-	Property0		Property0	protected	true	N/A

-	Property1		Property1	protected	true	N/A

-	Property2		Property2	protected	true	N/A

-	NestedClass0		NestedClass0	private	true	N/A

-	NestedClass1		NestedClass1	private	true	N/A

-	NestedClass2		NestedClass2	private	true	N/A

-	Operation0		Operation0	package	false	N/A

-		Param0	Param0	public	N/A	in

-		Param1	Param1	public	N/A	out

-		Param2	Param2	public	N/A	return

-	Operation1		Operation1	package	false	

-		Param0	Param0	private	N/A	in

-		Param1	Param1	private	N/A	out

-		Param2	Param2	private	N/A	return

-	Operation2		Operation2	package	false	

-		Param0	Param0	package	N/A	in

-		Param1	Param1	package	N/A	out

-		Param2	Param2	package	N/A	return

+Class0			Class0	public	false	N/A
+	Propertyerty0		Property0	protected	true	N/A
+	Property1		Property1	protected	true	N/A
+	Property2		Property2	protected	true	N/A
+	NestedClass0		NestedClass0	private	true	N/A
+	NestedClass1		NestedClass1	private	true	N/A
+	NestedClass2		NestedClass2	private	true	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
+Class0			Class0	public	false	N/A
+	Property0		Property0	protected	true	N/A
+	Property1		Property1	protected	true	N/A
+	Property2		Property2	protected	true	N/A
+	NestedClass0		NestedClass0	private	true	N/A
+	NestedClass1		NestedClass1	private	true	N/A
+	NestedClass2		NestedClass2	private	true	N/A
+	Operation0		Operation0	package	false	N/A
+		Param0	Param0	public	N/A	in
+		Param1	Param1	public	N/A	out
+		Param2	Param2	public	N/A	return
+	Operation1		Operation1	package	false	
+		Param0	Param0	private	N/A	in
+		Param1	Param1	private	N/A	out
+		Param2	Param2	private	N/A	return
+	Operation2		Operation2	package	false	
+		Param0	Param0	package	N/A	in
+		Param1	Param1	package	N/A	out
+		Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml
index b4a9e5ca0f7..03789110028 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_H3_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.notation
index 1173e1d4eeb..73dcc87458d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.notation
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_6-d4wHrxEeSFP8xW-pegcg" name="ClassTreeTable0" currentRowAxisProvider="_6-d4w3rxEeSFP8xW-pegcg" currentColumnAxisProvider="_6-d4wXrxEeSFP8xW-pegcg">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_IyBvQHryEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">

-    <intListValue>0</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_6-d4wXrxEeSFP8xW-pegcg" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_6-d4w3rxEeSFP8xW-pegcg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_6-d4wHrxEeSFP8xW-pegcg" name="ClassTreeTable0" currentRowAxisProvider="_6-d4w3rxEeSFP8xW-pegcg" currentColumnAxisProvider="_6-d4wXrxEeSFP8xW-pegcg">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_IyBvQHryEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_6-d4wXrxEeSFP8xW-pegcg" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_6-d4w3rxEeSFP8xW-pegcg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.txt
index a65a2f0bac3..0212eba427f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.txt
@@ -1,44 +1,44 @@
-Class0				Class0	public	false	N/A

-	ownedAttribute						

-		Property0		Property0	protected	true	N/A

-		Property1		Property1	protected	true	N/A

-		Property2		Property2	protected	true	N/A

-	nestedClassifier						

-		NestedClass0		NestedClass0	private	true	N/A

-		NestedClass1		NestedClass1	private	true	N/A

-		NestedClass2		NestedClass2	private	true	N/A

-	ownedOperation						

-		Operation0		Operation0	package	false	N/A						

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-		Operation1		Operation1	package	false	

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-		Operation2		Operation2	package	false	

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-Class1				Class1	public	false	N/A

-	ownedAttribute						

-		Property0		Property0	protected	true	N/A

-		Property1		Property1	protected	true	N/A

-		Property2		Property2	protected	true	N/A

-	nestedClassifier						

-		NestedClass0		NestedClass0	private	true	N/A

-		NestedClass1		NestedClass1	private	true	N/A

-		NestedClass2		NestedClass2	private	true	N/A

-	ownedOperation						

-		Operation0		Operation0	package	false	N/A

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-		Operation1		Operation1	package	false	

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-		Operation2		Operation2	package	false	

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

+Class0				Class0	public	false	N/A
+	ownedAttribute						
+		Property0		Property0	protected	true	N/A
+		Property1		Property1	protected	true	N/A
+		Property2		Property2	protected	true	N/A
+	nestedClassifier						
+		NestedClass0		NestedClass0	private	true	N/A
+		NestedClass1		NestedClass1	private	true	N/A
+		NestedClass2		NestedClass2	private	true	N/A
+	ownedOperation						
+		Operation0		Operation0	package	false	N/A						
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+		Operation1		Operation1	package	false	
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+		Operation2		Operation2	package	false	
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+Class1				Class1	public	false	N/A
+	ownedAttribute						
+		Property0		Property0	protected	true	N/A
+		Property1		Property1	protected	true	N/A
+		Property2		Property2	protected	true	N/A
+	nestedClassifier						
+		NestedClass0		NestedClass0	private	true	N/A
+		NestedClass1		NestedClass1	private	true	N/A
+		NestedClass2		NestedClass2	private	true	N/A
+	ownedOperation						
+		Operation0		Operation0	package	false	N/A
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+		Operation1		Operation1	package	false	
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+		Operation2		Operation2	package	false	
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
 			Param2	Param2	package	N/A	return
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml
index cfe242f3c81..7a70252695c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_3fyn4HrwEeSFP8xW-pegcg" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_3fyn4HrwEeSFP8xW-pegcg" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.notation
index 70439e85918..f2a3b5b78b1 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.notation
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_HyfhsHruEeSFP8xW-pegcg" name="ClassTreeTable0" currentRowAxisProvider="_Hyfhs3ruEeSFP8xW-pegcg" currentColumnAxisProvider="_HyfhsXruEeSFP8xW-pegcg">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_M2GlgHruEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">

-    <intListValue>0</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_HyfhsXruEeSFP8xW-pegcg" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-   <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_Hyfhs3ruEeSFP8xW-pegcg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_HyfhsHruEeSFP8xW-pegcg" name="ClassTreeTable0" currentRowAxisProvider="_Hyfhs3ruEeSFP8xW-pegcg" currentColumnAxisProvider="_HyfhsXruEeSFP8xW-pegcg">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_M2GlgHruEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_HyfhsXruEeSFP8xW-pegcg" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+   <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_Hyfhs3ruEeSFP8xW-pegcg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.txt
index 56cbcd5d0ab..01f2c9cbe98 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.txt
@@ -1,50 +1,50 @@
-Class0					Class0	public	false	N/A

-	ownedAttribute							

-		Property0			Property0	protected	true	N/A

-		Property1			Property1	protected	true	N/A

-		Property2			Property2	protected	true	N/A

-	nestedClassifier							

-		NestedClass0			NestedClass0	private	true	N/A

-		NestedClass1			NestedClass1	private	true	N/A

-		NestedClass2			NestedClass2	private	true	N/A

-	ownedOperation							

-		Operation0			Operation0	package	false	N/A

-			ownedParameter					

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-		Operation1			Operation1	package	false	

-			ownedParameter					

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-		Operation2			Operation2	package	false	

-			ownedParameter					

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

-Class1					Class1	public	false	N/A

-	ownedAttribute							

-		Property0			Property0	protected	true	N/A

-		Property1			Property1	protected	true	N/A

-		Property2			Property2	protected	true	N/A

-	nestedClassifier							

-		NestedClass0			NestedClass0	private	true	N/A

-		NestedClass1			NestedClass1	private	true	N/A

-		NestedClass2			NestedClass2	private	true	N/A

-	ownedOperation							

-		Operation0			Operation0	package	false	N/A

-			ownedParameter					

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-		Operation1			Operation1	package	false	

-			ownedParameter					

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-		Operation2			Operation2	package	false	

-			ownedParameter					

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

+Class0					Class0	public	false	N/A
+	ownedAttribute							
+		Property0			Property0	protected	true	N/A
+		Property1			Property1	protected	true	N/A
+		Property2			Property2	protected	true	N/A
+	nestedClassifier							
+		NestedClass0			NestedClass0	private	true	N/A
+		NestedClass1			NestedClass1	private	true	N/A
+		NestedClass2			NestedClass2	private	true	N/A
+	ownedOperation							
+		Operation0			Operation0	package	false	N/A
+			ownedParameter					
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+		Operation1			Operation1	package	false	
+			ownedParameter					
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+		Operation2			Operation2	package	false	
+			ownedParameter					
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
+Class1					Class1	public	false	N/A
+	ownedAttribute							
+		Property0			Property0	protected	true	N/A
+		Property1			Property1	protected	true	N/A
+		Property2			Property2	protected	true	N/A
+	nestedClassifier							
+		NestedClass0			NestedClass0	private	true	N/A
+		NestedClass1			NestedClass1	private	true	N/A
+		NestedClass2			NestedClass2	private	true	N/A
+	ownedOperation							
+		Operation0			Operation0	package	false	N/A
+			ownedParameter					
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+		Operation1			Operation1	package	false	
+			ownedParameter					
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+		Operation2			Operation2	package	false	
+			ownedParameter					
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
 				Param2	Param2	package	N/A	return
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml
index 8e2bf6169fc..b29805c29c9 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GFLrUHruEeSFP8xW-pegcg" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GFLrUHruEeSFP8xW-pegcg" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.notation
index c4c2a81dc4a..9124f0def18 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.notation
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.txt
index a016017adfb..c04e90aa968 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.txt
@@ -1,27 +1,27 @@
-Class							

-	Class0			Class0	public	false	N/A

-		Operation0		Operation0	package	false	N/A

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-		Operation1		Operation1	package	false	

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-		Operation2		Operation2	package	false	

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

-	Class1			Class1	public	false	N/A

-		Operation0		Operation0	package	false	N/A

-			Param0	Param0	public	N/A	in

-			Param1	Param1	public	N/A	out

-			Param2	Param2	public	N/A	return

-		Operation1		Operation1	package	false	

-			Param0	Param0	private	N/A	in

-			Param1	Param1	private	N/A	out

-			Param2	Param2	private	N/A	return

-		Operation2		Operation2	package	false	

-			Param0	Param0	package	N/A	in

-			Param1	Param1	package	N/A	out

-			Param2	Param2	package	N/A	return

+Class							
+	Class0			Class0	public	false	N/A
+		Operation0		Operation0	package	false	N/A
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+		Operation1		Operation1	package	false	
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+		Operation2		Operation2	package	false	
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
+	Class1			Class1	public	false	N/A
+		Operation0		Operation0	package	false	N/A
+			Param0	Param0	public	N/A	in
+			Param1	Param1	public	N/A	out
+			Param2	Param2	public	N/A	return
+		Operation1		Operation1	package	false	
+			Param0	Param0	private	N/A	in
+			Param1	Param1	private	N/A	out
+			Param2	Param2	private	N/A	return
+		Operation2		Operation2	package	false	
+			Param0	Param0	package	N/A	in
+			Param1	Param1	package	N/A	out
+			Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.notation
index da905a4724c..aa77d49cc2d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.notation
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">

-    <intListValue>1</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-      </axisUsedAsAxisProvider>

-      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>

-    </ownedAxisConfigurations>

-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">

-      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>

-    </ownedAxisConfigurations>

-    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">

-      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-    </axisManagerConfigurations>

-  </localRowHeaderAxisConfiguration>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.txt
index 66bac2a0fec..14c7422d131 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.txt
@@ -1,33 +1,33 @@
-Class								

-	Class0				Class0	public	false	N/A

-		Operation0			Operation0	package	false	N/A

-			ownedParameter					

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-		Operation1			Operation1	package	false	

-			ownedParameter					

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-		Operation2			Operation2	package	false	

-			ownedParameter					

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

-	Class1				Class1	public	false	N/A

-		Operation0			Operation0	package	false	N/A

-			ownedParameter					

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-		Operation1			Operation1	package	false	

-			ownedParameter					

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-		Operation2			Operation2	package	false	

-			ownedParameter					

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

+Class								
+	Class0				Class0	public	false	N/A
+		Operation0			Operation0	package	false	N/A
+			ownedParameter					
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+		Operation1			Operation1	package	false	
+			ownedParameter					
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+		Operation2			Operation2	package	false	
+			ownedParameter					
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
+	Class1				Class1	public	false	N/A
+		Operation0			Operation0	package	false	N/A
+			ownedParameter					
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+		Operation1			Operation1	package	false	
+			ownedParameter					
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+		Operation2			Operation2	package	false	
+			ownedParameter					
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml
index ea67ed7d78b..f4bb277fb84 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.notation
index f600da30f90..e08952ce8d5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.notation
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">

-  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_lPbmEHyJEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">

-    <intListValue>2</intListValue>

-  </styles>

-  <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_lPbmEHyJEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
+    <intListValue>2</intListValue>
+  </styles>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.txt
index dfd6705f88b..4128fb932ae 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.txt
@@ -1,45 +1,45 @@
-Class								

-	Class0				Class0	public	false	N/A

-		ownedAttribute						

-			Property0		Property0	protected	true	N/A

-			Property1		Property1	protected	true	N/A

-			Property2		Property2	protected	true	N/A

-		nestedClassifier						

-			NestedClass0		NestedClass0	private	true	N/A

-			NestedClass1		NestedClass1	private	true	N/A

-			NestedClass2		NestedClass2	private	true	N/A

-		ownedOperation						

-			Operation0		Operation0	package	false	N/A

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-			Operation1		Operation1	package	false	

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-			Operation2		Operation2	package	false	

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

-	Class1				Class1	public	false	N/A

-		ownedAttribute						

-			Property0		Property0	protected	true	N/A

-			Property1		Property1	protected	true	N/A

-			Property2		Property2	protected	true	N/A

-		nestedClassifier						

-			NestedClass0		NestedClass0	private	true	N/A

-			NestedClass1		NestedClass1	private	true	N/A

-			NestedClass2		NestedClass2	private	true	N/A

-		ownedOperation						

-			Operation0		Operation0	package	false	N/A

-				Param0	Param0	public	N/A	in

-				Param1	Param1	public	N/A	out

-				Param2	Param2	public	N/A	return

-			Operation1		Operation1	package	false	

-				Param0	Param0	private	N/A	in

-				Param1	Param1	private	N/A	out

-				Param2	Param2	private	N/A	return

-			Operation2		Operation2	package	false	

-				Param0	Param0	package	N/A	in

-				Param1	Param1	package	N/A	out

-				Param2	Param2	package	N/A	return

+Class								
+	Class0				Class0	public	false	N/A
+		ownedAttribute						
+			Property0		Property0	protected	true	N/A
+			Property1		Property1	protected	true	N/A
+			Property2		Property2	protected	true	N/A
+		nestedClassifier						
+			NestedClass0		NestedClass0	private	true	N/A
+			NestedClass1		NestedClass1	private	true	N/A
+			NestedClass2		NestedClass2	private	true	N/A
+		ownedOperation						
+			Operation0		Operation0	package	false	N/A
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+			Operation1		Operation1	package	false	
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+			Operation2		Operation2	package	false	
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
+	Class1				Class1	public	false	N/A
+		ownedAttribute						
+			Property0		Property0	protected	true	N/A
+			Property1		Property1	protected	true	N/A
+			Property2		Property2	protected	true	N/A
+		nestedClassifier						
+			NestedClass0		NestedClass0	private	true	N/A
+			NestedClass1		NestedClass1	private	true	N/A
+			NestedClass2		NestedClass2	private	true	N/A
+		ownedOperation						
+			Operation0		Operation0	package	false	N/A
+				Param0	Param0	public	N/A	in
+				Param1	Param1	public	N/A	out
+				Param2	Param2	public	N/A	return
+			Operation1		Operation1	package	false	
+				Param0	Param0	private	N/A	in
+				Param1	Param1	private	N/A	out
+				Param2	Param2	private	N/A	return
+			Operation2		Operation2	package	false	
+				Param0	Param0	package	N/A	in
+				Param1	Param1	package	N/A	out
+				Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml
index b4a9e5ca0f7..03789110028 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.di
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.notation
index bd26a1bf02b..4ee367ff29c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.notation
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">

-  <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>

-  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>

-  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.txt
index fd452015fb7..6d7aff81849 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.txt
@@ -1,51 +1,51 @@
-Class										

-	Class0					Class0	public	false	N/A	

-		ownedAttribute								

-			Property0			Property0	protected	true	N/A	

-			Property1			Property1	protected	true	N/A	

-			Property2			Property2	protected	true	N/A	

-		nestedClassifier								

-			NestedClass0			NestedClass0	private	true	N/A	

-			NestedClass1			NestedClass1	private	true	N/A	

-			NestedClass2			NestedClass2	private	true	N/A	

-		ownedOperation								

-			Operation0			Operation0	package	false	N/A	

-				ownedParameter						

-					Param0	Param0	public	N/A	in	

-					Param1	Param1	public	N/A	out	

-					Param2	Param2	public	N/A	return	

-			Operation1			Operation1	package	false		

-				ownedParameter						

-					Param0	Param0	private	N/A	in	

-					Param1	Param1	private	N/A	out	

-					Param2	Param2	private	N/A	return	

-			Operation2			Operation2	package	false		

-				ownedParameter						

-					Param0	Param0	package	N/A	in	

-					Param1	Param1	package	N/A	out	

-					Param2	Param2	package	N/A	return	

-	Class1					Class1	public	false	N/A	

-		ownedAttribute								

-			Property0			Property0	protected	true	N/A	

-			Property1			Property1	protected	true	N/A	

-			Property2			Property2	protected	true	N/A	

-		nestedClassifier								

-			NestedClass0			NestedClass0	private	true	N/A	

-			NestedClass1			NestedClass1	private	true	N/A	

-			NestedClass2			NestedClass2	private	true	N/A	

-		ownedOperation								

-			Operation0			Operation0	package	false	N/A	

-				ownedParameter						

-					Param0	Param0	public	N/A	in	

-					Param1	Param1	public	N/A	out	

-					Param2	Param2	public	N/A	return	

-			Operation1			Operation1	package	false		

-				ownedParameter						

-					Param0	Param0	private	N/A	in	

-					Param1	Param1	private	N/A	out	

-					Param2	Param2	private	N/A	return	

-			Operation2			Operation2	package	false		

-				ownedParameter						

-					Param0	Param0	package	N/A	in	

-					Param1	Param1	package	N/A	out	

-					Param2	Param2	package	N/A	return	

+Class										
+	Class0					Class0	public	false	N/A	
+		ownedAttribute								
+			Property0			Property0	protected	true	N/A	
+			Property1			Property1	protected	true	N/A	
+			Property2			Property2	protected	true	N/A	
+		nestedClassifier								
+			NestedClass0			NestedClass0	private	true	N/A	
+			NestedClass1			NestedClass1	private	true	N/A	
+			NestedClass2			NestedClass2	private	true	N/A	
+		ownedOperation								
+			Operation0			Operation0	package	false	N/A	
+				ownedParameter						
+					Param0	Param0	public	N/A	in	
+					Param1	Param1	public	N/A	out	
+					Param2	Param2	public	N/A	return	
+			Operation1			Operation1	package	false		
+				ownedParameter						
+					Param0	Param0	private	N/A	in	
+					Param1	Param1	private	N/A	out	
+					Param2	Param2	private	N/A	return	
+			Operation2			Operation2	package	false		
+				ownedParameter						
+					Param0	Param0	package	N/A	in	
+					Param1	Param1	package	N/A	out	
+					Param2	Param2	package	N/A	return	
+	Class1					Class1	public	false	N/A	
+		ownedAttribute								
+			Property0			Property0	protected	true	N/A	
+			Property1			Property1	protected	true	N/A	
+			Property2			Property2	protected	true	N/A	
+		nestedClassifier								
+			NestedClass0			NestedClass0	private	true	N/A	
+			NestedClass1			NestedClass1	private	true	N/A	
+			NestedClass2			NestedClass2	private	true	N/A	
+		ownedOperation								
+			Operation0			Operation0	package	false	N/A	
+				ownedParameter						
+					Param0	Param0	public	N/A	in	
+					Param1	Param1	public	N/A	out	
+					Param2	Param2	public	N/A	return	
+			Operation1			Operation1	package	false		
+				ownedParameter						
+					Param0	Param0	private	N/A	in	
+					Param1	Param1	private	N/A	out	
+					Param2	Param2	private	N/A	return	
+			Operation2			Operation2	package	false		
+				ownedParameter						
+					Param0	Param0	package	N/A	in	
+					Param1	Param1	package	N/A	out	
+					Param2	Param2	package	N/A	return	
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml
index b4a9e5ca0f7..03789110028 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_Test.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..af036e7419b
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.notation
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="__7v3wHvFEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="__7we0HvFEeSOIP1uah0_EA" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__7v3wHvFEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__7we0HvFEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..d04236e1621
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.txt
@@ -0,0 +1,26 @@
+Class0	Class0	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  Param0	Param0	public	N/A	in
+  Param1	Param1	public	N/A	out
+  Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  Param0	Param0	private	N/A	in
+  Param1	Param1	private	N/A	out
+  Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  Param0	Param0	package	N/A	in
+  Param1	Param1	package	N/A	out
+  Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  Param0	Param0	public	N/A	in
+  Param1	Param1	public	N/A	out
+  Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  Param0	Param0	private	N/A	in
+  Param1	Param1	private	N/A	out
+  Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  Param0	Param0	package	N/A	in
+  Param1	Param1	package	N/A	out
+  Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..10041f39695
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.notation
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="__7v3wHvFEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="__7we0HvFEeSOIP1uah0_EA" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__7v3wHvFEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__7we0HvFEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..ea8948cfbf1
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.txt
@@ -0,0 +1,32 @@
+Class0	Class0	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  ownedParameter				
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  ownedParameter				
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  ownedParameter				
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  ownedParameter				
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  ownedParameter				
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  ownedParameter				
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..fb2134335c5
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_KJpacHxbEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H3_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H3_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_Uchc4Hu1EeSOIP1uah0_EA" pasteConfiguration="_3W0-cHvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Uchc4Xu1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_3W0-cXvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_Uchc4nu1EeSOIP1uah0_EA" pasteConfiguration="_3W0-cnvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Uchc43u1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_3W0-c3vHEeSOIP1uah0_EA" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-cHvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-cXvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-cnvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-c3vHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..39901d44fcb
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.txt
@@ -0,0 +1,44 @@
+Class0	Class0	public	false	N/A
+ Property0	Property0	protected	true	N/A
+ Property1	Property1	protected	true	N/A
+ Property2	Property2	protected	true	N/A
+ NestedClass0	NestedClass0	private	true	N/A
+ NestedClass1	NestedClass1	private	true	N/A
+ NestedClass2	NestedClass2	private	true	N/A
+ Operation0	Operation0	package	false	N/A
+  ownedParameter				
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  ownedParameter				
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  ownedParameter				
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ Property0	Property0	protected	true	N/A
+ Property1	Property1	protected	true	N/A
+ Property2	Property2	protected	true	N/A
+ NestedClass0	NestedClass0	private	true	N/A
+ NestedClass1	NestedClass1	private	true	N/A
+ NestedClass2	NestedClass2	private	true	N/A
+ Operation0	Operation0	package	false	N/A
+  ownedParameter				
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  ownedParameter				
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  ownedParameter				
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..812667773ff
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_GOQnYHu1EeSOIP1uah0_EA" pasteConfiguration="_zqX60HvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_GOQnYXu1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_zqX60XvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_GOQnYnu1EeSOIP1uah0_EA" pasteConfiguration="_zqX60nvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_GOQnY3u1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_zqX603vHEeSOIP1uah0_EA" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX60HvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX60XvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX60nvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX603vHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_GOQnYHu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _GOQnYnu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..5b8cfaf50c8
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.txt
@@ -0,0 +1,44 @@
+Class0	Class0	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..7408df17a33
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.notation
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_MS6yAEy6EeWchoxaIsyqEA" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_Uchc4Hu1EeSOIP1uah0_EA" pasteConfiguration="_ujT6YHvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Uchc4Xu1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_ujT6YXvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_Uchc4nu1EeSOIP1uah0_EA" pasteConfiguration="_ujT6YnvHEeSOIP1uah0_EA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Uchc43u1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_ujT6Y3vHEeSOIP1uah0_EA" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6YHvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6YXvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6YnvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6Y3vHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..cb0d7f540a5
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.txt
@@ -0,0 +1,50 @@
+Class0	Class0	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   ownedParameter				
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   ownedParameter				
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   ownedParameter				
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   ownedParameter				
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   ownedParameter				
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   ownedParameter				
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..eb87421d82e
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.notation
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..d04236e1621
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.txt
@@ -0,0 +1,26 @@
+Class0	Class0	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  Param0	Param0	public	N/A	in
+  Param1	Param1	public	N/A	out
+  Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  Param0	Param0	private	N/A	in
+  Param1	Param1	private	N/A	out
+  Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  Param0	Param0	package	N/A	in
+  Param1	Param1	package	N/A	out
+  Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  Param0	Param0	public	N/A	in
+  Param1	Param1	public	N/A	out
+  Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  Param0	Param0	private	N/A	in
+  Param1	Param1	private	N/A	out
+  Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  Param0	Param0	package	N/A	in
+  Param1	Param1	package	N/A	out
+  Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..0f4008591b8
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.notation
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>1</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..ea8948cfbf1
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.txt
@@ -0,0 +1,32 @@
+Class0	Class0	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  ownedParameter				
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  ownedParameter				
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  ownedParameter				
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ Operation0	Operation0	package	false	N/A
+  ownedParameter				
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  ownedParameter				
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  ownedParameter				
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H1_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..017341755ec
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.notation
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_Yk1o8GZzEeSDCaDFwPGYVw" name="ClassTreeTable0" currentRowAxisProvider="_Yk1o82ZzEeSDCaDFwPGYVw" currentColumnAxisProvider="_Yk1o8WZzEeSDCaDFwPGYVw">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_PCk74HcDEeSihK466TsMPg" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_H3_H1_SingleColumn_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H3_H1_SingleColumn_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_Yk1o8WZzEeSDCaDFwPGYVw" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_Yk1o82ZzEeSDCaDFwPGYVw" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_53PFMG5fEeSSk_Uaj9vcpQ" indexStyle="NUMERIC" displayIndex="false">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_BU9nQXcBEeSihK466TsMPg" pasteConfiguration="_3ExscHyIEeSxVJAGQ_SozA" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BU9nQncBEeSihK466TsMPg">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_BU9nQ3cBEeSihK466TsMPg" pasteConfiguration="_3ExscXyIEeSxVJAGQ_SozA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BU9nRHcBEeSihK466TsMPg">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_BU9nRXcBEeSihK466TsMPg" pasteConfiguration="_3ExscnyIEeSxVJAGQ_SozA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BU9nRncBEeSihK466TsMPg">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_BU9nR3cBEeSihK466TsMPg" pasteConfiguration="_3Exsc3yIEeSxVJAGQ_SozA" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_BU9nSHcBEeSihK466TsMPg">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_er6pEHu1EeSOIP1uah0_EA" pasteConfiguration="_3ExsdHyIEeSxVJAGQ_SozA" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_er6pEXu1EeSOIP1uah0_EA">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3ExscHyIEeSxVJAGQ_SozA" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3ExscXyIEeSxVJAGQ_SozA" pastedElementId="org.eclipse.papyrus.uml.Property">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3ExscnyIEeSxVJAGQ_SozA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3Exsc3yIEeSxVJAGQ_SozA" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3ExsdHyIEeSxVJAGQ_SozA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_BU9nQHcBEeSihK466TsMPg" localSpecificConfigurations="_BU9nQXcBEeSihK466TsMPg _BU9nQ3cBEeSihK466TsMPg _BU9nRXcBEeSihK466TsMPg _BU9nR3cBEeSihK466TsMPg _er6pEHu1EeSOIP1uah0_EA">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..3565e13cdfa
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.txt
@@ -0,0 +1,38 @@
+Class0	Class0	public	false	N/A
+ Propertyerty0	Property0	protected	true	N/A
+ Property1	Property1	protected	true	N/A
+ Property2	Property2	protected	true	N/A
+ NestedClass0	NestedClass0	private	true	N/A
+ NestedClass1	NestedClass1	private	true	N/A
+ NestedClass2	NestedClass2	private	true	N/A
+ Operation0	Operation0	package	false	N/A
+  Param0	Param0	public	N/A	in
+  Param1	Param1	public	N/A	out
+  Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  Param0	Param0	private	N/A	in
+  Param1	Param1	private	N/A	out
+  Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  Param0	Param0	package	N/A	in
+  Param1	Param1	package	N/A	out
+  Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ Propertyerty0	Property0	protected	true	N/A
+ Property1	Property1	protected	true	N/A
+ Property2	Property2	protected	true	N/A
+ NestedClass0	NestedClass0	private	true	N/A
+ NestedClass1	NestedClass1	private	true	N/A
+ NestedClass2	NestedClass2	private	true	N/A
+ Operation0	Operation0	package	false	N/A
+  Param0	Param0	public	N/A	in
+  Param1	Param1	public	N/A	out
+  Param2	Param2	public	N/A	return
+ Operation1	Operation1	package	false	
+  Param0	Param0	private	N/A	in
+  Param1	Param1	private	N/A	out
+  Param2	Param2	private	N/A	return
+ Operation2	Operation2	package	false	
+  Param0	Param0	package	N/A	in
+  Param1	Param1	package	N/A	out
+  Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..03789110028
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_H3_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..8ddddf4c7c3
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.notation
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_6-d4wHrxEeSFP8xW-pegcg" name="ClassTreeTable0" currentRowAxisProvider="_6-d4w3rxEeSFP8xW-pegcg" currentColumnAxisProvider="_6-d4wXrxEeSFP8xW-pegcg">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_IyBvQHryEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_SingleColumn_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_SingleColumn_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_6-d4wXrxEeSFP8xW-pegcg" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_6-d4w3rxEeSFP8xW-pegcg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..5b8cfaf50c8
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.txt
@@ -0,0 +1,44 @@
+Class0	Class0	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..7a70252695c
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_3fyn4HrwEeSFP8xW-pegcg" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..b494f6e9b07
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.notation
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_HyfhsHruEeSFP8xW-pegcg" name="ClassTreeTable0" currentRowAxisProvider="_Hyfhs3ruEeSFP8xW-pegcg" currentColumnAxisProvider="_HyfhsXruEeSFP8xW-pegcg">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_M2GlgHruEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">
+    <intListValue>0</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_SingleColumn_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_SingleColumn_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_HyfhsXruEeSFP8xW-pegcg" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_Hyfhs3ruEeSFP8xW-pegcg" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..cb0d7f540a5
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.txt
@@ -0,0 +1,50 @@
+Class0	Class0	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   ownedParameter				
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   ownedParameter				
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   ownedParameter				
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
+Class1	Class1	public	false	N/A
+ ownedAttribute				
+  Property0	Property0	protected	true	N/A
+  Property1	Property1	protected	true	N/A
+  Property2	Property2	protected	true	N/A
+ nestedClassifier				
+  NestedClass0	NestedClass0	private	true	N/A
+  NestedClass1	NestedClass1	private	true	N/A
+  NestedClass2	NestedClass2	private	true	N/A
+ ownedOperation				
+  Operation0	Operation0	package	false	N/A
+   ownedParameter				
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   ownedParameter				
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   ownedParameter				
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..b29805c29c9
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_H1_V3_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_GFLrUHruEeSFP8xW-pegcg" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..dc78bfa5dda
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.notation
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..8441517687b
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.txt
@@ -0,0 +1,27 @@
+Class				
+ Class0	Class0	public	false	N/A
+  Operation0	Operation0	package	false	N/A
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
+ Class1	Class1	public	false	N/A
+  Operation0	Operation0	package	false	N/A
+   Param0	Param0	public	N/A	in
+   Param1	Param1	public	N/A	out
+   Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   Param0	Param0	private	N/A	in
+   Param1	Param1	private	N/A	out
+   Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   Param0	Param0	package	N/A	in
+   Param1	Param1	package	N/A	out
+   Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..34e875ce82a
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.notation
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_SingleColumn_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_zDRtIXucEeSTu_GUJ96b9g" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_zDRtI3ucEeSTu_GUJ96b9g" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+  <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_0T5ngHucEeSTu_GUJ96b9g" indexStyle="NUMERIC">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OkXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMHufEeSTu_GUJ96b9g" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OknucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6Ok3ucEeSTu_GUJ96b9g" pasteConfiguration="_BOaEMnufEeSTu_GUJ96b9g" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlHucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_0T6OlXucEeSTu_GUJ96b9g" pasteConfiguration="_BOaENHufEeSTu_GUJ96b9g" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_0T6OlnucEeSTu_GUJ96b9g">
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+      </axisUsedAsAxisProvider>
+      <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+      <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+    </ownedAxisConfigurations>
+    <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
+      <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+    </axisManagerConfigurations>
+  </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..627fe97f7b2
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.txt
@@ -0,0 +1,33 @@
+Class				
+ Class0	Class0	public	false	N/A
+  Operation0	Operation0	package	false	N/A
+   ownedParameter				
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   ownedParameter				
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   ownedParameter				
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
+ Class1	Class1	public	false	N/A
+  Operation0	Operation0	package	false	N/A
+   ownedParameter				
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+  Operation1	Operation1	package	false	
+   ownedParameter				
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+  Operation2	Operation2	package	false	
+   ownedParameter				
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..f4bb277fb84
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_H1_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yDlxwHucEeSTu_GUJ96b9g" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..88e9df7a427
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.notation
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_lPbmEHyJEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
+    <intListValue>2</intListValue>
+  </styles>
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_DlB9cEwNEeWoh96HNeXPCQ" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_SingleColumn_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_SingleColumn_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..9dd681a6e88
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.txt
@@ -0,0 +1,45 @@
+Class				
+ Class0	Class0	public	false	N/A
+  ownedAttribute				
+   Property0	Property0	protected	true	N/A
+   Property1	Property1	protected	true	N/A
+   Property2	Property2	protected	true	N/A
+  nestedClassifier				
+   NestedClass0	NestedClass0	private	true	N/A
+   NestedClass1	NestedClass1	private	true	N/A
+   NestedClass2	NestedClass2	private	true	N/A
+  ownedOperation				
+   Operation0	Operation0	package	false	N/A
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+   Operation1	Operation1	package	false	
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+   Operation2	Operation2	package	false	
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
+ Class1	Class1	public	false	N/A
+  ownedAttribute				
+   Property0	Property0	protected	true	N/A
+   Property1	Property1	protected	true	N/A
+   Property2	Property2	protected	true	N/A
+  nestedClassifier				
+   NestedClass0	NestedClass0	private	true	N/A
+   NestedClass1	NestedClass1	private	true	N/A
+   NestedClass2	NestedClass2	private	true	N/A
+  ownedOperation				
+   Operation0	Operation0	package	false	N/A
+    Param0	Param0	public	N/A	in
+    Param1	Param1	public	N/A	out
+    Param2	Param2	public	N/A	return
+   Operation1	Operation1	package	false	
+    Param0	Param0	private	N/A	in
+    Param1	Param1	private	N/A	out
+    Param2	Param2	private	N/A	return
+   Operation2	Operation2	package	false	
+    Param0	Param0	package	N/A	in
+    Param1	Param1	package	N/A	out
+    Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..03789110028
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_H1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.notation
new file mode 100644
index 00000000000..a7ce5e4ef5c
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.notation
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_sJEZUEy8EeWchoxaIsyqEA" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_SingleColumn_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_SingleColumn_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+  <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.txt
new file mode 100644
index 00000000000..a1d0d293c96
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.txt
@@ -0,0 +1,51 @@
+Class				
+ Class0	Class0	public	false	N/A
+  ownedAttribute				
+   Property0	Property0	protected	true	N/A
+   Property1	Property1	protected	true	N/A
+   Property2	Property2	protected	true	N/A
+  nestedClassifier				
+   NestedClass0	NestedClass0	private	true	N/A
+   NestedClass1	NestedClass1	private	true	N/A
+   NestedClass2	NestedClass2	private	true	N/A
+  ownedOperation				
+   Operation0	Operation0	package	false	N/A
+    ownedParameter				
+     Param0	Param0	public	N/A	in
+     Param1	Param1	public	N/A	out
+     Param2	Param2	public	N/A	return
+   Operation1	Operation1	package	false	
+    ownedParameter				
+     Param0	Param0	private	N/A	in
+     Param1	Param1	private	N/A	out
+     Param2	Param2	private	N/A	return
+   Operation2	Operation2	package	false	
+    ownedParameter				
+     Param0	Param0	package	N/A	in
+     Param1	Param1	package	N/A	out
+     Param2	Param2	package	N/A	return
+ Class1	Class1	public	false	N/A
+  ownedAttribute				
+   Property0	Property0	protected	true	N/A
+   Property1	Property1	protected	true	N/A
+   Property2	Property2	protected	true	N/A
+  nestedClassifier				
+   NestedClass0	NestedClass0	private	true	N/A
+   NestedClass1	NestedClass1	private	true	N/A
+   NestedClass2	NestedClass2	private	true	N/A
+  ownedOperation				
+   Operation0	Operation0	package	false	N/A
+    ownedParameter				
+     Param0	Param0	public	N/A	in
+     Param1	Param1	public	N/A	out
+     Param2	Param2	public	N/A	return
+   Operation1	Operation1	package	false	
+    ownedParameter				
+     Param0	Param0	private	N/A	in
+     Param1	Param1	private	N/A	out
+     Param2	Param2	private	N/A	return
+   Operation2	Operation2	package	false	
+    ownedParameter				
+     Param0	Param0	package	N/A	in
+     Param1	Param1	package	N/A	out
+     Param2	Param2	package	N/A	return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.uml
new file mode 100644
index 00000000000..03789110028
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/single_column/PasteWithCategories_V1_V3_V1_SingleColumn_Test.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesMultiColumnsTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesMultiColumnsTests.java
new file mode 100644
index 00000000000..7cb975f2d30
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesMultiColumnsTests.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+/**
+ * This allows to manage the paste with categories for the multi columns.
+ */
+public class AbstractPasteWithCategoriesMultiColumnsTests extends AbstractPasteWithCategoriesTests {
+
+	/**
+	 * The paste folder paste for the single column.
+	 */
+	public static final String MULTI_COLUMNS = "multi_columns/"; //$NON-NLS-1$
+	
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.AbstractPasteWithCategoriesTests#getSourcePath()
+	 */
+	@Override
+	protected String getSourcePath() {
+		return new StringBuilder(super.getSourcePath()).append(MULTI_COLUMNS).toString();
+	}
+	
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesSingleColumnTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesSingleColumnTests.java
new file mode 100644
index 00000000000..64e4ba6ef51
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesSingleColumnTests.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+/**
+ * This allows to manage the paste with categories for the single column.
+ */
+public class AbstractPasteWithCategoriesSingleColumnTests extends AbstractPasteWithCategoriesTests {
+
+	/**
+	 * The paste folder paste for the single column.
+	 */
+	public static final String SINGLE_COLUMN = "single_column/"; //$NON-NLS-1$
+	
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.AbstractPasteWithCategoriesTests#getSourcePath()
+	 */
+	@Override
+	protected String getSourcePath() {
+		return new StringBuilder(super.getSourcePath()).append(SINGLE_COLUMN).toString();
+	}
+	
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.java
index 4e0c37c453f..d6af1b413c9 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_MultiColumns_Test.java
@@ -1,24 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- */

-public class PasteWithCategories_Empty_H1_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 1 hidden category to the 2nd level (H1) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_Empty_H1_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..b694e1457f0
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 1 hidden category to the 2nd level (H1) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_Empty_H1_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.java
index 1a324a7fe82..3adcde979fb 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_MultiColumns_Test.java
@@ -1,25 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- */

-public class PasteWithCategories_Empty_H1_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 1 hidden category to the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_Empty_H1_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..52347c61f3d
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H1_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 1 hidden category to the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_Empty_H1_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.java
index 2d207dbf566..db8917a4152 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_MultiColumns_Test.java
@@ -1,24 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- */

-public class PasteWithCategories_Empty_H3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 1 hidden category to the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_Empty_H3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..49e0e8e8fdc
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_H3_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 3 hidden categories on the 2nd level (H3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_Empty_H3_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.java
index 7848ec9be83..c0279b981e2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_MultiColumns_Test.java
@@ -1,25 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- */

-public class PasteWithCategories_Empty_V3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 3 hidden categories on the 2nd level (H3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_Empty_V3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..44ee5d283af
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 3 visible categories on the 2nd level (V3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_Empty_V3_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.java
index d675cb45b6c..c3c10f01139 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_MultiColumns_Test.java
@@ -1,25 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- */

-public class PasteWithCategories_Empty_V3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 3 visible categories on the 2nd level (V3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_Empty_V3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..16ea5166a73
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_Empty_V3_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with empty 1st level, 3 visible categories on the 2nd level (V3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_Empty_V3_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.java
index 1fdf5c62371..fd41c234e6d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_MultiColumns_Test.java
@@ -1,28 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_H1_H1_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 1 hidden category on the 2nd level (H1) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_H1_H1_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..604a315247f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 1 hidden category on the 2nd level (H1) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_H1_H1_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.java
index ad2146c05f8..02bc8d8ee66 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_MultiColumns_Test.java
@@ -1,29 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_H1_H1_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 1 hidden category on the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_H1_H1_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..f576d30b95b
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H1_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 1 hidden category on the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_H1_H1_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.java
index 6c2da169281..85b801af4e6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_MultiColumns_Test.java
@@ -1,26 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_H1_H3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 3 hidden categories on the 2nd level (H3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_H1_H3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..f64dddf0551
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_H3_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 3 hidden categories on the 2nd level (H3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_H1_H3_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.java
index 046be265792..b043db4784e 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_MultiColumns_Test.java
@@ -1,27 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_H1_V3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 3 visible categories on the 2nd level (V3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_H1_V3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..3b358403bd3
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 3 visible categories on the 2nd level (V3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_H1_V3_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.java
index df2c35d2c27..473396f96d7 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_MultiColumns_Test.java
@@ -1,26 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_H1_V3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 3 visible categories on the 2nd level (V3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_H1_V3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..81ae3ae8eca
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_H1_V3_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 hidden category to the 1st level (H1), 3 visible categories on the 2nd level (V3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_H1_V3_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.java
index 64adb8d2602..5f1ca7bcccb 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_MultiColumns_Test.java
@@ -1,28 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_V1_H1_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 1 hidden category on the 2nd level (H1) and 1 hidden categories to the 3rd level (H1).
+ */
+public class PasteWithCategories_V1_H1_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..b437c3fa064
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 1 hidden category on the 2nd level (H1) and 1 hidden categories to the 3rd level (H1).
+ */
+public class PasteWithCategories_V1_H1_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.java
index 51923013558..76c02853f22 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_MultiColumns_Test.java
@@ -1,26 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_V1_H1_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 1 hidden category on the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_V1_H1_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..b9bb52136bf
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_H1_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 1 hidden category on the 2nd level (H1) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_V1_H1_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.java
index 5b6757cb636..aa09ce995c5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_MultiColumns_Test.java
@@ -1,25 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_V1_V3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 3 visible categories on the 2nd level (V3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_V1_V3_H1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_SingleColumn_Test.java
new file mode 100644
index 00000000000..7f3be258267
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_H1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 3 visible categories on the 2nd level (V3) and 1 hidden category to the 3rd level (H1).
+ */
+public class PasteWithCategories_V1_V3_H1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.java
index 79acb591074..6ea8e4b113a 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_MultiColumns_Test.java
@@ -1,26 +1,22 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;

-

-

-/**

- * @author VL222926

- *

- *         test pastes with 1 hidden category to the first level (H1), 3 hidden categories on the 2nd level (H3) et 1 hidden categories to the 3rd level

- *

- */

-public class PasteWithCategories_V1_V3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesTests {

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 1 visible categories on the 2nd level (V3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_V1_V3_V1_MultiColumns_Test extends AbstractPasteWithCategoriesMultiColumnsTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_SingleColumn_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_SingleColumn_Test.java
new file mode 100644
index 00000000000..575c0881492
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/PasteWithCategories_V1_V3_V1_SingleColumn_Test.java
@@ -0,0 +1,22 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests;
+
+
+/**
+ * Test pastes with 1 visible category to the 1st level (V1), 1 visible categories on the 2nd level (V3) and 1 visible category to the 3rd level (V1).
+ */
+public class PasteWithCategories_V1_V3_V1_SingleColumn_Test extends AbstractPasteWithCategoriesSingleColumnTests {
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java
index 3f4b9381719..ca65da78d7d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java
@@ -45,19 +45,33 @@ import org.eclipse.papyrus.uml.nattable.clazz.config.tests.filter.ReopenFiltered
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.filter.ReopenFilteredTable_V1_V1_H1;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.filter.ReopenFilteredTable_V1_V1_V1;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_H1_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_H1_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_H1_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_H1_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_H3_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_H3_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_V3_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_V3_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_V3_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_Empty_V3_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_H1_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_H1_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_H1_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_H1_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_H3_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_H3_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_V3_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_V3_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_V3_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_H1_V3_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_H1_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_H1_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_H1_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_H1_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_V3_H1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_V3_H1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_V3_V1_MultiColumns_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.paste.tests.PasteWithCategories_V1_V3_V1_SingleColumn_Test;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.sort.Sort_H1_H3_H1;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.sort.Sort_V1_V3_V1;
 import org.eclipse.papyrus.uml.nattable.clazz.config.tests.unset.UnsetCellValueWithProfile_V1_V3_V1_Test;
@@ -120,8 +134,25 @@ import org.junit.runners.Suite.SuiteClasses;
 		ReopenFilteredTable_V1_V1_H1.class,
 		ReopenFilteredTable_V1_V1_V1.class,
 
-
-
+		// Paste tests for single column
+		PasteWithCategories_Empty_H1_H1_SingleColumn_Test.class,
+		PasteWithCategories_Empty_H1_V1_SingleColumn_Test.class,
+		PasteWithCategories_Empty_H3_V1_SingleColumn_Test.class,
+		PasteWithCategories_Empty_V3_H1_SingleColumn_Test.class,
+		PasteWithCategories_Empty_V3_V1_SingleColumn_Test.class,
+
+		PasteWithCategories_H1_H1_H1_SingleColumn_Test.class,
+		PasteWithCategories_H1_H1_V1_SingleColumn_Test.class,
+		PasteWithCategories_H1_H3_H1_SingleColumn_Test.class,
+		PasteWithCategories_H1_V3_H1_SingleColumn_Test.class,
+		PasteWithCategories_H1_V3_V1_SingleColumn_Test.class,
+
+		PasteWithCategories_V1_H1_H1_SingleColumn_Test.class,
+		PasteWithCategories_V1_H1_V1_SingleColumn_Test.class,
+		PasteWithCategories_V1_V3_H1_SingleColumn_Test.class,
+		PasteWithCategories_V1_V3_V1_SingleColumn_Test.class,
+
+		// Paste tests for multi columns
 		PasteWithCategories_Empty_H1_H1_MultiColumns_Test.class,
 		PasteWithCategories_Empty_H1_V1_MultiColumns_Test.class,
 		PasteWithCategories_Empty_H3_V1_MultiColumns_Test.class,
@@ -137,8 +168,6 @@ import org.junit.runners.Suite.SuiteClasses;
 		PasteWithCategories_V1_H1_H1_MultiColumns_Test.class,
 		PasteWithCategories_V1_H1_V1_MultiColumns_Test.class,
 		PasteWithCategories_V1_V3_H1_MultiColumns_Test.class,
-
-
 		PasteWithCategories_V1_V3_V1_MultiColumns_Test.class,
 })
 public class AllTests {