Bug 448065: [Tree Table] Tree table must support Paste from an external

Spreadsheet
https://bugs.eclipse.org/bugs/show_bug.cgi?id=448065

- Manage the paste with single hierarchical column
- Add the JUnit tests 

Change-Id: Ie1f3f55a94024ba28f8f438c8d3ab6911646bd7c
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net>

147 files changed, 5451 insertions, 3656 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java
index 27d6eddc1e5..caaca58e7ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java
@@ -57,6 +57,11 @@ public class CSVLexer {
 	 */
 	private static final int BUFFER_SIZE = 1024;
 
+	/**
+	 * Boolean to determinate if the beginning string whitespace must be kept or removed.
+	 */
+	private final boolean keepBeginningWhiteSpace;
+
 	private RewindableTextStream input; // the input stream
 	private char separator; // The cell separator character
 	private char textMarker; // The raw text beginning and end character
@@ -74,13 +79,30 @@ public class CSVLexer {
 	 * @param textMarker
 	 *            The character that marks the beginning and end of raw text
 	 */
-	public CSVLexer(Reader input, char valueSeparator, char textMarker) {
+	public CSVLexer(final Reader input, final char valueSeparator, final char textMarker) {
+		this(input, valueSeparator, textMarker, false);
+	}
+	
+	/**
+	 * Initializes this lexer with boolean to determinate if the beginning whitespace must be kept.
+	 *
+	 * @param input
+	 *            The input text reader
+	 * @param valueSeparator
+	 *            The character that separates values in rows
+	 * @param textMarker
+	 *            The character that marks the beginning and end of raw text
+	 * @param keepBeginningWhiteSpace
+	 *            Boolean to determinate if the beginning string whitespace must be kept or removed
+	 */
+	public CSVLexer(final Reader input, final char valueSeparator, final char textMarker, final boolean keepBeginningWhiteSpace) {
 		this.input = new RewindableTextStream(input);
 		this.separator = valueSeparator;
 		this.textMarker = textMarker;
 		this.builder = new char[BUFFER_SIZE];
 		this.lastTokenType = TOKEN_ERROR;
 		this.lastTokenValue = null;
+		this.keepBeginningWhiteSpace = keepBeginningWhiteSpace;
 	}
 
 	/**
@@ -112,10 +134,12 @@ public class CSVLexer {
 		if (input.isAtEnd()) {
 			return getTokenEOF();
 		}
-		while (isWhitespace(c)) {
-			c = input.read();
-			if (input.isAtEnd()) {
-				return getTokenEOF();
+		if (!keepBeginningWhiteSpace) {
+			while (isWhitespace(c)) {
+				c = input.read();
+				if (input.isAtEnd()) {
+					return getTokenEOF();
+				}
 			}
 		}
 
@@ -285,7 +309,7 @@ public class CSVLexer {
 	/**
 	 *
 	 * @return
-	 *         the number of read characters
+	 * 		the number of read characters
 	 */
 	public long getReadCharacters() {
 		return this.input.getReadCharacters();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
index 9768b2fa96c..3539dd5bf43 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
@@ -40,7 +40,23 @@ public class CSVParser {
 	 *            The character that marks the beginning and end of raw text
 	 */
 	public CSVParser(Reader input, char valueSeparator, char textMarker) {
-		this.lexer = new CSVLexer(input, valueSeparator, textMarker);
+		this(input, valueSeparator, textMarker, false);
+	}
+	
+	/**
+	 * Initializes this parser with boolean to determinate if the beginning whitespace must be kept.
+	 *
+	 * @param input
+	 *            The input to parse
+	 * @param valueSeparator
+	 *            The character that separates values in rows
+	 * @param textMarker
+	 *            The character that marks the beginning and end of raw text
+	 * @param keepBeginningWhiteSpace
+	 *            Boolean to determinate if the beginning string whitespace must be kept or removed
+	 */
+	public CSVParser(final Reader input, final char valueSeparator, final char textMarker, final boolean keepBeginningWhiteSpace) {
+		this.lexer = new CSVLexer(input, valueSeparator, textMarker, keepBeginningWhiteSpace);
 		this.output = new Document();
 	}
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
index ec237a4bff7..eff5b124c5b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectTreeAxisInNattableCommandProvider.java
@@ -1,1122 +1,1143 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- *

- * 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:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

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

-package org.eclipse.papyrus.infra.nattable.provider;

-

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

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * 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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

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

-import java.io.IOException;

-import java.io.Reader;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EFactory;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.workspace.EMFCommandOperation;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.commands.CheckedOperationHistory;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;

-import org.eclipse.papyrus.infra.nattable.parsers.CellIterator;

-import org.eclipse.papyrus.infra.nattable.parsers.RowIterator;

-import org.eclipse.papyrus.infra.nattable.paste.IValueSetter;

-import org.eclipse.papyrus.infra.nattable.paste.PastePostActionRegistry;

-import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.PasteSeverityCode;

-import org.eclipse.papyrus.infra.nattable.utils.PasteTreeUtils;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter;

-import org.eclipse.ui.progress.UIJob;

-

-/**

- * Paste command manager for the paste in the table

- *

- * @author VL222926

- *

- */

-// TODO : refactor me to create common ancestor with normal paste

-// TODO : refactor me : This class should be in oep.infra.emf.nattable

-public class PasteEObjectTreeAxisInNattableCommandProvider {

-

-	private static final int MIN_AXIS_FOR_PROGRESS_MONITOR = 5;

-

-	/**

-	 * the containment feature to use

-	 */

-	private EStructuralFeature containmentFeature;

-

-	/**

-	 * the type to create

-	 */

-	private IElementType typeToCreate;

-

-	/**

-	 * the table manager

-	 */

-	private INattableModelManager tableManager;

-

-	/**

-	 * the paste mode

-	 */

-	// private PasteEnablementStatus pasteMode;

-

-	/**

-	 * if true, we are pasting in detached mode

-	 */

-	private boolean detachedMode;

-

-	/**

-	 * the list of the post actions do do

-	 */

-	private List<String> postActions;

-

-	/**

-	 * the list of the axis to paste

-	 */

-	// private final String[] axisToPaste;

-

-	/**

-	 * the paste helper

-	 */

-	private final CSVPasteHelper pasteHelper;

-

-	/**

-	 * the converter map

-	 */

-	private Map<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter> existingConverters;

-

-	private static final String PASTE_ACTION_TASK_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteAction;

-

-	private static final String PASTE_ROWS_JOB_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteRows;

-

-	private static final String PASTE_COLUMNS_JOB_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteColumns;

-

-	private static final String PASTE_COMMAND_HAS_BEEN_CANCELLED = Messages.PasteEObjectAxisInTableCommandProvider_CommandCreationHasBeenCancelled;

-

-	private static final String PASTE_COMMAND_CANT_BE_EXECUTED = "The Paste command can't be executed"; //$NON-NLS-1$

-

-	private static final String PASTE_COMMAND_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteFromStringCommand;

-

-	private static final String CREATING_ELEMENT_A_NUMBER_X_Y = Messages.PasteEObjectAxisInTableCommandProvider_CreatingAnumberXonY;

-

-	protected final boolean pasteColumn;

-

-	private final int nbOperationsToDo;

-

-

-	// we refresh the dialog each X read char

-	private int refreshEachReadChar = 1000;

-

-	/**

-	 * if <code>true</code> the command can't be created and executed

-	 */

-	private boolean isDisposed = false;

-

-	/**

-	 * the reader to parse

-	 */

-	private final Reader reader;

-

-	/**

-	 * the parser to use

-	 */

-	private CSVParser parser;

-

-	int factor;

-

-	private Table table;

-

-	final TransactionalEditingDomain tableEditingDomain;

-

-	final TransactionalEditingDomain contextEditingDomain;

-

-	final EObject tableContext;

-

-	List<Object> secondAxis;

-

-	public PasteEObjectTreeAxisInNattableCommandProvider(INattableModelManager tableManager, boolean pasteColumn, Reader reader, CSVPasteHelper pasteHelper2, long totalSize) {

-		this.tableManager = tableManager;

-		// this.pasteMode = status;

-		this.existingConverters = new HashMap<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter>();

-		this.pasteHelper = pasteHelper2;

-		this.reader = reader;

-		this.pasteColumn = pasteColumn;

-		this.table = tableManager.getTable();

-		this.tableContext = table.getContext();

-		tableEditingDomain = TableEditingDomainUtils.getTableEditingDomain(table);

-		contextEditingDomain = TableEditingDomainUtils.getTableContextEditingDomain(table);

-		// TODO improve refresh and progress monitor...

-		long div = -1;

-		if (totalSize > Integer.MAX_VALUE) {

-			div = totalSize / Integer.MAX_VALUE;

-			if (div > Integer.MAX_VALUE) {

-				div = 2 * div;

-			}

-			this.factor = (int) div;

-			this.nbOperationsToDo = (int) (totalSize / div);

-		} else {

-			this.factor = 1;

-			this.nbOperationsToDo = (int) totalSize;

-		}

-		parser = this.pasteHelper.createParser(reader);

-		init();

-	}

-

-	protected List<IPasteConfiguration> getPasteConfigurationFor(int depth) {

-		List<IPasteConfiguration> pasteConfs = new ArrayList<IPasteConfiguration>();

-		for (TreeFillingConfiguration current : FillingConfigurationUtils.getAllTreeFillingConfiguration(table)) {

-			if (current.getDepth() == depth) {

-				IPasteConfiguration pasteConf = current.getPasteConfiguration();

-				Assert.isNotNull(pasteConf);// must not be null here! (so must be verified before

-				pasteConfs.add(pasteConf);

-			}

-		}

-		if (depth == 0 && pasteConfs.size() == 0 && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, depth)) {

-			final IPasteConfiguration conf = (IPasteConfiguration) AxisConfigurationUtils.getIAxisConfigurationUsedInTable(tableManager.getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);

-			pasteConfs.add(conf);

-		}

-		return pasteConfs;

-	}

-

-

-	protected IPasteConfiguration getPasteConfigurationsFor(int depth, String categoryName) {

-		if (depth == 0 && !FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {

-			AbstractHeaderAxisConfiguration conf = table.getLocalRowHeaderAxisConfiguration();

-			if (conf != null) {

-				conf = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-			}

-			List<TreeFillingConfiguration> filling = FillingConfigurationUtils.getAllTreeFillingConfigurationForDepth(table, depth);

-			List<IAxisConfiguration> referencedPasteConf = new ArrayList<IAxisConfiguration>();

-			for (TreeFillingConfiguration tmp : filling) {

-				if (tmp.getPasteConfiguration() != null) {

-					referencedPasteConf.add(tmp.getPasteConfiguration());

-				}

-			}

-			for (IAxisConfiguration axisConf : conf.getOwnedAxisConfigurations()) {

-				if (axisConf instanceof IPasteConfiguration && !referencedPasteConf.contains(axisConf)) {

-					return (IPasteConfiguration) axisConf;

-				}

-			}

-		}

-		for (TreeFillingConfiguration curr : FillingConfigurationUtils.getAllTreeFillingConfiguration(table)) {

-			if (curr.getDepth() == depth) {

-				if (categoryName == null || categoryName.isEmpty()) {

-					return curr.getPasteConfiguration();

-				} else {

-					String featureName = curr.getAxisUsedAsAxisProvider().getAlias();

-					if (featureName == null || "".equals(featureName)) {

-						Object element = curr.getAxisUsedAsAxisProvider().getElement();

-						// TODO : doesn't work for stereotype propertyes

-						// TODO : use label provider

-						if (element instanceof EStructuralFeature) {

-							featureName = ((EStructuralFeature) element).getName();

-						}

-					}

-					if (categoryName.equals(featureName)) {

-						return (IPasteConfiguration) curr.getPasteConfiguration();

-					}

-

-				}

-			}

-		}

-		// TODO : verify category name

-		return null;

-	}

-

-	protected boolean pasteInDetachedMode(Table table) {

-		List<IPasteConfiguration> confs = getPasteConfigurationFor(0);

-		for (IPasteConfiguration current : confs) {

-			if (current.isDetachedMode()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 * inits the field of this class

-	 */

-	private void init() {

-		this.detachedMode = pasteInDetachedMode(table);

-		// PasteEObjectConfiguration configuration = null;

-		// if (this.pasteColumn) {

-		// configuration = (PasteEObjectConfiguration) AxisConfigurationUtils.getIAxisConfigurationUsedInTable(this.table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), true);

-		// this.secondAxis = tableManager.getRowElementsList();

-		// } else {

-		//

-		// configuration = (PasteEObjectConfiguration) AxisConfigurationUtils.getIAxisConfigurationUsedInTable(this.table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);

-		this.secondAxis = tableManager.getColumnElementsList();

-		// }

-		// if (configuration != null) {

-		// this.containmentFeature = configuration.getPasteElementContainementFeature();

-		// this.typeToCreate = ElementTypeRegistry.getInstance().getType(configuration.getPastedElementId());

-		// this.postActions = configuration.getPostActions();

-		// this.detachedMode = configuration.isDetachedMode();

-		// }

-	}

-

-	/**

-	 *

-	 * @param useProgressMonitor

-	 *            boolean indicating that we must do the paste with a progress monitor

-	 *            TODO : post actions are not yet supported in the in the detached mode

-	 */

-	public void executePasteFromStringCommand(final boolean useProgressMonitor) {

-		// if (this.pasteColumn) {// not yet supported

-		// return;

-		// }

-		if (this.isDisposed) {

-			throw new RuntimeException("The command provider is disposed"); //$NON-NLS-1$

-		}

-		final String pasteJobName;

-		// if (this.pasteColumn) {

-		// pasteJobName = PASTE_COLUMNS_JOB_NAME;

-		// } else {

-		pasteJobName = PASTE_ROWS_JOB_NAME;

-		// }

-		// if (this.detachedMode) {

-		// executePasteFromStringCommandInDetachedMode(useProgressMonitor, pasteJobName);

-		// } else {

-		executePasteFromStringCommandInAttachedMode(useProgressMonitor, pasteJobName);

-		// }

-	}

-

-

-	/**

-	 *

-	 * @param useProgressMonitor

-	 *            boolean indicating that we must do the paste with a progress monitor

-	 */

-	private void executePasteFromStringCommandInDetachedMode(final boolean useProgressMonitor, final String pasteJobName) {

-		// the map used to share objects between the paste action and the cell value managers

-		final Map<Object, Object> sharedMap = new HashMap<Object, Object>();

-		// the map used to store useful information for the paste

-		sharedMap.put(Constants.PASTED_ELEMENT_CONTAINER_KEY, tableContext);

-		sharedMap.put(Constants.REFERENCES_TO_SET_KEY, new ArrayList<IValueSetter>());

-		sharedMap.put(Constants.CELLS_TO_ADD_KEY, new ArrayList<Cell>());

-

-		// used to be able to apply stereotypes required by columns properties, in detached mode even if there is no post actions defined in the table configuration

-		// see bug 431691: [Table 2] Paste from Spreadsheet must be able to apply required stereotypes for column properties in all usecases

-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=431691

-		sharedMap.put(Constants.ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY, new ArrayList<String>());

-

-		if (!useProgressMonitor) {

-			final ICommand pasteCommand = getPasteFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, new NullProgressMonitor(), sharedMap);

-			try {

-				CheckedOperationHistory.getInstance().execute(pasteCommand, new NullProgressMonitor(), null);

-			} catch (ExecutionException e) {

-				Activator.log.error(e);

-			}

-			sharedMap.clear();

-		} else {

-			// we create a job in order to don't freeze the UI

-			final UIJob job = new UIJob(pasteJobName) {

-

-				@Override

-				public IStatus runInUIThread(IProgressMonitor monitor) {

-

-					final ICommand pasteCommand = getPasteFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, monitor, sharedMap);

-					if (pasteCommand == null) {

-						return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, PASTE_COMMAND_HAS_BEEN_CANCELLED);

-					}

-					// we execute the paste command

-					if (pasteCommand.canExecute()) {

-						try {

-							CheckedOperationHistory.getInstance().execute(pasteCommand, monitor, null);

-						} catch (ExecutionException e) {

-							return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occured during the paste", e); //$NON-NLS-1$

-						} finally {

-							sharedMap.clear();

-						}

-						monitor.done();

-						return Status.OK_STATUS;

-					} else {

-						sharedMap.clear();

-						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, PASTE_COMMAND_CANT_BE_EXECUTED);

-					}

-				}

-			};

-			job.setUser(true);

-			job.schedule();

-		}

-	}

-

-	/**

-	 *

-	 * @param useProgressMonitor

-	 *            boolean indicating that we must do the paste with a progress monitor

-	 */

-	private void executePasteFromStringCommandInAttachedMode(final boolean useProgressMonitor, final String pasteJobName) {

-		if (!useProgressMonitor) {

-			final ICommand pasteCommand = getPasteFromStringCommandInAttachedMode(contextEditingDomain, tableEditingDomain, new NullProgressMonitor());

-			try {

-				CheckedOperationHistory.getInstance().execute(pasteCommand, new NullProgressMonitor(), null);

-			} catch (ExecutionException e) {

-				Activator.log.error(e);

-			}

-		} else {

-			// we create a job in order to don't freeze the UI

-			final UIJob job = new UIJob(pasteJobName) {

-

-				@Override

-				public IStatus runInUIThread(IProgressMonitor monitor) {

-

-					final ICommand pasteCommand = getPasteFromStringCommandInAttachedMode(contextEditingDomain, tableEditingDomain, monitor);

-					if (pasteCommand == null) {

-						return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, PASTE_COMMAND_HAS_BEEN_CANCELLED);

-					}

-					// we execute the paste command

-					if (pasteCommand.canExecute()) {

-						try {

-

-

-							EMFCommandOperation op = new EMFCommandOperation(contextEditingDomain, new GMFtoEMFCommandWrapper(pasteCommand));

-							// EMFOperationCommand c = new EMFOperationCommand(contextEditingDomain, pasteCommand);

-							CheckedOperationHistory.getInstance().execute(op, monitor, null);

-						} catch (Exception e) {

-							return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occured during the paste", e); //$NON-NLS-1$

-						}

-						monitor.done();

-						return Status.OK_STATUS;

-					} else {

-						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, PASTE_COMMAND_CANT_BE_EXECUTED);

-					}

-				}

-			};

-			job.setUser(true);

-			job.schedule();

-		}

-	}

-

-	private ICommand getPasteRowFromStringCommandInDetachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor, final Map<Object, Object> sharedMap) {

-		if (progressMonitor != null) {

-			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);// +1 to add the created elements to the table

-		}

-		// the list of the created elements

-		final List<Object> createdElements = new ArrayList<Object>();

-

-		// 2.2 create the creation request and find the command provider

-		final EClass eClassToCreate = this.typeToCreate.getEClass();

-		final EFactory eFactory = eClassToCreate.getEPackage().getEFactoryInstance();

-

-		// 2.3 create the axis

-		int nbCreatedElements = 0;

-

-		// we refresh the dialog each X read char

-		long readChar = 0;

-		long previousreadChar = 0;

-		final RowIterator rowIter = this.parser.parse();

-		while (rowIter.hasNext()) {

-			final CellIterator cellIter = rowIter.next();

-			if (!cellIter.hasNext()) {

-				continue;// to avoid blank line

-			}

-			if ((progressMonitor != null) && progressMonitor.isCanceled()) {

-				// the user click on the cancel button

-				return null;

-			}

-

-			readChar = readChar + (parser.getReadCharacters() - previousreadChar);

-			previousreadChar = parser.getReadCharacters();

-

-

-			if (progressMonitor != null && readChar > refreshEachReadChar) {

-				readChar = 0;

-				progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[] { nbCreatedElements, typeToCreate.getEClass().getName() })); //$NON-NLS-1$

-				progressMonitor.worked(refreshEachReadChar);

-			}

-			nbCreatedElements++;

-

-			// 2.3.3 we create the element itself

-			final EObject createdElement = eFactory.create(eClassToCreate);

-

-			createdElements.add(createdElement);

-			nbCreatedElements++;

-			for (final String currentPostActions : this.postActions) {

-				PastePostActionRegistry.INSTANCE.doPostAction(this.tableManager, currentPostActions, tableContext, createdElement, sharedMap, null);// TODO : remove this parameter

-			}

-

-			// 2.3.4 we set these properties values

-			final Iterator<Object> secondAxisIterator = secondAxis.iterator();

-			while (secondAxisIterator.hasNext() && cellIter.hasNext()) {

-				final Object currentAxis = secondAxisIterator.next();

-				final String valueAsString = cellIter.next();

-				final Object columnObject;

-				final Object rowObject;

-				if (this.pasteColumn) {

-					columnObject = createdElement;

-					rowObject = currentAxis;

-				} else {

-					columnObject = currentAxis;

-					rowObject = createdElement;

-				}

-

-

-				boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject, sharedMap);

-				if (isEditable) {

-					final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, this.pasteHelper.getMultiValueSeparator());

-					CellManagerFactory.INSTANCE.setStringValue(columnObject, rowObject, valueAsString, converter, tableManager, sharedMap);

-				}

-			}

-

-			// TODO : do something to say that the number of cell is not correct!

-			while (cellIter.hasNext()) {

-				cellIter.next();// required!

-			}

-		}

-

-		// 2.4 we add the created elements to the table

-		final AbstractTransactionalCommand pasteCommand = new AbstractTransactionalCommand(tableEditingDomain, PASTE_COMMAND_NAME, null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				// initialize lists

-				final Collection<String> postActions = getPostActions();

-

-				// we add the post actions added by cell manager

-				// see bug 431691: [Table 2] Paste from Spreadsheet must be able to apply required stereotypes for column properties in all usecases

-				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=431691

-				@SuppressWarnings("unchecked")

-				final Collection<String> postActionsAddedByCellManagers = (Collection<String>) sharedMap.get(Constants.ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY);

-				postActions.addAll(postActionsAddedByCellManagers);

-

-				@SuppressWarnings("unchecked")

-				final List<Cell> cells = (List<Cell>) sharedMap.get(Constants.CELLS_TO_ADD_KEY);

-				@SuppressWarnings("unchecked")

-				final List<IValueSetter> valueToSet = (List<IValueSetter>) sharedMap.get(Constants.REFERENCES_TO_SET_KEY);

-

-				int nbTasks = 1; // to add created elements to the model

-				nbTasks = nbTasks + 1; // to add createds elements to the table

-				nbTasks = nbTasks + postActions.size();// to do post actions after the attachment to the model

-				nbTasks = nbTasks + 1; // to attach the cells to the model

-				nbTasks = nbTasks + valueToSet.size(); // to set the references values

-

-				if (progressMonitor != null) {

-					if (progressMonitor.isCanceled()) {

-						localDispose();

-						return CommandResult.newCancelledCommandResult();

-					}

-					progressMonitor.beginTask(Messages.PasteEObjectAxisInTableCommandProvider_FinishingThePaste, nbTasks);

-				}

-

-				// 1. Add the elements to the context

-				AddCommand.create(contextEditingDomain, tableContext, containmentFeature, createdElements).execute();

-

-				if (progressMonitor != null) {

-					if (progressMonitor.isCanceled()) {

-						return CommandResult.newCancelledCommandResult();

-					}

-					progressMonitor.worked(1);

-					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_AddingElementToTheTable);

-				}

-

-				Command cmd = null;

-				if (pasteColumn) {

-					cmd = tableManager.getAddColumnElementCommand(createdElements); // TODO remove one of these 2 lines

-				} else {

-					cmd = tableManager.getAddRowElementCommand(createdElements);

-				}

-				if (cmd != null) {// could be null

-					cmd.execute();

-				}

-

-				if (progressMonitor != null) {

-					if (progressMonitor.isCanceled()) {

-						return CommandResult.newCancelledCommandResult();

-					}

-					progressMonitor.worked(1);

-					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_DoingAdditionalActions);

-				}

-

-

-				for (final String currentPostActions : postActions) {

-					PastePostActionRegistry.INSTANCE.concludePostAction(tableManager, currentPostActions, sharedMap);

-					progressMonitor.worked(1);

-				}

-

-

-				if (progressMonitor != null) {

-					if (progressMonitor.isCanceled()) {

-						return CommandResult.newCancelledCommandResult();

-					}

-					progressMonitor.worked(1);

-					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_LinkingReferencesToTheModel);

-				}

-

-				// we set the references

-

-				if (valueToSet.size() > 0) {

-					for (final IValueSetter current : valueToSet) {

-						current.doSetValue(contextEditingDomain);

-						if (progressMonitor != null) {

-							if (progressMonitor.isCanceled()) {

-								return CommandResult.newCancelledCommandResult();

-							}

-							progressMonitor.worked(1);

-						}

-					}

-				}

-

-				// the cells must be attached at the end (in order to update properly the cell map in the table manager

-				if (progressMonitor != null) {

-					if (progressMonitor.isCanceled()) {

-						return CommandResult.newCancelledCommandResult();

-					}

-					progressMonitor.worked(1);

-				}

-

-				// add the created cells to the table

-				AddCommand.create(tableEditingDomain, table, NattablePackage.eINSTANCE.getTable_Cells(), cells).execute();

-

-				if (progressMonitor != null) {

-					progressMonitor.done();

-				}

-				localDispose();

-				return CommandResult.newOKCommandResult();

-			}

-		};

-

-		return pasteCommand;

-	}

-

-

-	/**

-	 *

-	 *

-	 * @param sharedMap

-	 *            a map used to share objects and informations during the paste between this class and the cell value manager

-	 * @param commandCreationCancelProvider

-	 *            the creation command progress monitor

-	 * @param commandExecutionProgressMonitor

-	 *            the command execution progress monitor

-	 * @return

-	 *         the command to use to finish the paste (the main part of the paste is directly done here)

-	 */

-	private ICommand getPasteFromStringCommandInDetachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor, final Map<Object, Object> sharedMap) {

-		if (!this.pasteColumn) {

-			return getPasteRowFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, progressMonitor, sharedMap);

-		} else {

-			// return getPasteColumnFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, progressMonitor, sharedMap);

-		}

-		return null;

-	}

-

-

-	//

-	// /**

-	// *

-	// * @param commandCreationCancelProvider

-	// * the creation command progress monitor

-	// * @param commandExecutionProgressMonitor

-	// * the command execution progress monitor

-	// * @return

-	// */

-	// private ICommand getPasteColumnFromStringInAttachedModeCommand(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {

-	// // initialize the progress monitor

-	// if (progressMonitor != null) {

-	// progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);

-	// }

-	//

-	// // 2.2 create the creation request and find the command provider

-	// final CreateElementRequest createRequest = new CreateElementRequest(contextEditingDomain, this.tableContext, this.typeToCreate, (EReference) this.containmentFeature);

-	// final IElementEditService tableContextCommandProvider = ElementEditServiceUtils.getCommandProvider(tableContext);

-	//

-	// final ICommand pasteAllCommand = new AbstractTransactionalCommand(contextEditingDomain, PASTE_COMMAND_NAME, null) {

-	//

-	//

-	// /**

-	// *

-	// * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

-	// *

-	// * @param monitor

-	// * @param info

-	// * @return

-	// * @throws ExecutionException

-	// */

-	// @Override

-	// protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-	// long readChar = 0;

-	// long previousreadChar = 0;

-	//

-	// final RowIterator rowIter = parser.parse();

-	// int nbCreatedElements = 0;

-	// while (rowIter.hasNext()) {

-	// final CellIterator cellIter = rowIter.next();

-	// if (!cellIter.hasNext()) {

-	// continue;// to avoid blank line

-	// }

-	// if (progressMonitor != null && progressMonitor.isCanceled()) {

-	// progressMonitor.done();

-	// localDispose();

-	// return CommandResult.newCancelledCommandResult();

-	// }

-	// readChar = readChar + (parser.getReadCharacters() - previousreadChar);

-	// previousreadChar = parser.getReadCharacters();

-	// if (progressMonitor != null && readChar > refreshEachReadChar) {

-	// readChar = 0;

-	//						progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[] { typeToCreate.getEClass().getName(), nbCreatedElements })); //$NON-NLS-1$

-	// progressMonitor.worked(refreshEachReadChar);

-	// }

-	// nbCreatedElements++;

-	// final ICommand commandCreation = tableContextCommandProvider.getEditCommand(createRequest);

-	// if (commandCreation.canExecute()) {

-	// // 1. we create the element

-	// commandCreation.execute(monitor, info);

-	// // we execute the creation command

-	//

-	// // 2. we add it to the table

-	// final CommandResult res = commandCreation.getCommandResult();

-	// commandCreation.dispose();

-	//

-	// final Object createdElement = res.getReturnValue();

-	// final Command addCommand;

-	// if (pasteColumn) {

-	// addCommand = tableManager.getAddColumnElementCommand(Collections.singleton(createdElement));

-	// } else {

-	// addCommand = tableManager.getAddRowElementCommand(Collections.singleton(createdElement));

-	// }

-	// if (addCommand != null) {// can be null

-	// addCommand.execute();

-	// addCommand.dispose();

-	// }

-	//

-	// // 3. we set the values

-	// final Iterator<?> secondAxisIterator = secondAxis.iterator();

-	// while (secondAxisIterator.hasNext() && cellIter.hasNext()) {

-	// final Object currentAxis = secondAxisIterator.next();

-	// final String valueAsString = cellIter.next();

-	// final Object columnObject;

-	// final Object rowObject;

-	// if (pasteColumn) {

-	// columnObject = createdElement;

-	// rowObject = currentAxis;

-	// } else {

-	// columnObject = currentAxis;

-	// rowObject = createdElement;

-	// }

-	//

-	//

-	// boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject);

-	//

-	// if (isEditable) {

-	// final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, pasteHelper.getMultiValueSeparator());

-	// final Command setValueCommand = CellManagerFactory.INSTANCE.getSetStringValueCommand(contextEditingDomain, columnObject, rowObject, valueAsString, converter, tableManager);

-	// if (setValueCommand != null && setValueCommand.canExecute()) {

-	// setValueCommand.execute();

-	// setValueCommand.dispose();

-	// }

-	// }

-	// }

-	// // TODO inform the user

-	// while (cellIter.hasNext()) {

-	// cellIter.next();// required

-	// }

-	// }

-	// }

-	// progressMonitor.done();

-	// localDispose();

-	// return CommandResult.newOKCommandResult();

-	// }

-	// };

-	// return pasteAllCommand;

-	// }

-

-

-

-

-

-	private boolean isCategory(int nbReadCell) {

-		return PasteTreeUtils.isCategory(nbReadCell, FillingConfigurationUtils.getMaxDepthForTree(table), StyleUtils.getHiddenDepths(table), FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0));

-	}

-

-

-	private int getDepth(int nbReadCell) {

-		return PasteTreeUtils.getDepth(nbReadCell, FillingConfigurationUtils.getMaxDepthForTree(table), StyleUtils.getHiddenDepths(table), FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0));

-	}

-

-	/**

-	 * 

-	 * @param iterator

-	 *            the cellIterator

-	 * @param nbReadCell

-	 * 

-	 */

-	protected void crossCellIteratorToFirstBodyCell(CellIterator cellIter, int nbReadCell) {

-		if (TableHelper.isSingleColumnTreeTable(table)) {

-			// TODO

-		} else {

-			int nbColumns = (FillingConfigurationUtils.getMaxDepthForTree(table) + 1) * 2;

-			if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {

-				nbColumns--;

-			}

-

-			// exit of the header part

-			List<Integer> hiddenDepth = StyleUtils.getHiddenDepths(table);

-			int nbVisibleColumns = nbColumns - hiddenDepth.size();

-

-			while (nbReadCell < nbVisibleColumns) {

-				cellIter.next();

-				nbReadCell++;

-			}

-		}

-

-	}

-

-	/**

-	 *

-	 * @param commandCreationCancelProvider

-	 *            the creation command progress monitor

-	 * @param commandExecutionProgressMonitor

-	 *            the command execution progress monitor

-	 * @return

-	 */

-	private ICommand getPasteRowFromStringInAttachedModeCommand(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {

-		// initialize the progress monitor

-		if (progressMonitor != null) {

-			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);

-		}

-

-		// 2.2 create the creation request and find the command provider

-		final ICommand pasteAllCommand = new AbstractTransactionalCommand(contextEditingDomain, PASTE_COMMAND_NAME, null) {

-

-

-			/**

-			 *

-			 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)

-			 *

-			 * @param monitor

-			 * @param info

-			 * @return

-			 * @throws ExecutionException

-			 */

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				List<IStatus> resultStatus = new ArrayList<IStatus>();

-

-				long readChar = 0;

-				long previousreadChar = 0;

-

-				// this map stores the last created object to a depth.

-				// its allows us to find easily the context to use for each created element

-				Map<Integer, EObject> contextMap = new HashMap<Integer, EObject>();

-				contextMap.put(Integer.valueOf(-1), table.getContext());

-

-				// 2. create a map with the last paste configuration used by depth

-				Map<Integer, PasteEObjectConfiguration> confMap = new HashMap<Integer, PasteEObjectConfiguration>();

-

-				final RowIterator rowIter = parser.parse();

-				int nbCreatedElements = 0;

-				int nbReadLine = 0;

-				while (rowIter.hasNext()) {

-					final CellIterator cellIter = rowIter.next();

-					nbReadLine++;

-					if (!cellIter.hasNext()) {

-						continue;// to avoid blank line

-					}

-					if (progressMonitor != null && progressMonitor.isCanceled()) {

-						progressMonitor.done();

-						localDispose();

-						return CommandResult.newCancelledCommandResult();

-					}

-					readChar = readChar + (parser.getReadCharacters() - previousreadChar);

-					previousreadChar = parser.getReadCharacters();

-

-					if (progressMonitor != null && readChar > refreshEachReadChar) {

-						readChar = 0;

-						// TODO : uncomment me, and move me, NPE on typeToCreate

-						//						progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[] { typeToCreate.getEClass().getName(), nbCreatedElements })); //$NON-NLS-1$

-						progressMonitor.worked(refreshEachReadChar);

-					}

-

-					// the iterator on columns

-					final Iterator<?> secondAxisIterator = secondAxis.iterator();

-

-

-					while (cellIter.hasNext()) {

-						String valueAsString = cellIter.next();

-						int nbReadCell = 1;

-

-						// test if the value is empty (we are in the tree header)

-						while (cellIter.hasNext() && valueAsString.isEmpty()) {

-							valueAsString = cellIter.next();

-							nbReadCell++;

-						}

-

-						int depth = -1;

-						boolean isCategory = false;

-						try {

-							depth = getDepth(nbReadCell);

-							isCategory = isCategory(nbReadCell);

-						} catch (UnsupportedOperationException ex) {

-							String message = NLS.bind("No defined depth for line {0}", nbReadCell); //$NON-NLS-1$

-							// The following lines allows to cancel all the paste if a problem of depth appears

-							// If a partial paste is authorized, remove this lines

-							Activator.log.error(message, ex);

-							IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_ERROR__MORE_LINES_THAN_DEPTH, message, null);

-							return new CommandResult(status);

-						}

-

-						if (isCategory) {

-							confMap.put(Integer.valueOf(depth), (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, valueAsString));

-							// lastConfiguration = (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, valueAsString);

-							while (cellIter.hasNext()) {

-								cellIter.next();

-							}

-							break;

-						}

-

-						// we get the paste configuration to use

-						PasteEObjectConfiguration pasteConfToUse = (PasteEObjectConfiguration) confMap.get(Integer.valueOf(depth));

-						if (pasteConfToUse == null) {

-							pasteConfToUse = (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, null);

-							if (pasteConfToUse != null) {

-								confMap.put(Integer.valueOf(depth), pasteConfToUse);

-							} else {

-								IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_ERROR__NO_PASTE_CONFIGURATION, NLS.bind("No paste configuration found for the depth {0}", depth), null);

-								return new CommandResult(status);

-							}

-						}

-						// get the paste configuration to use

-

-						// get the element type to use to create the element

-						IElementType typeToCreate = ElementTypeRegistry.getInstance().getType(pasteConfToUse.getPastedElementId());

-

-						EStructuralFeature containmentFeature = pasteConfToUse.getPasteElementContainementFeature();

-

-						// get the context to use

-						EObject context = contextMap.get(depth - 1);

-						final CreateElementRequest createRequest1 = new CreateElementRequest(contextEditingDomain, context, typeToCreate, (EReference) containmentFeature);

-						final IElementEditService creationContextCommandProvider = ElementEditServiceUtils.getCommandProvider(context);

-

-						final ICommand commandCreation = creationContextCommandProvider.getEditCommand(createRequest1);

-						if (null != commandCreation && commandCreation.canExecute()) {

-

-							// 1. we create the element

-							commandCreation.execute(monitor, info);

-							nbCreatedElements++;

-

-							// 2. we get the result of the command

-							final CommandResult res = commandCreation.getCommandResult();

-							commandCreation.dispose();

-

-							// 3 we update the map

-							final Object createdElement = res.getReturnValue();

-							contextMap.put(Integer.valueOf(depth), (EObject) createdElement);

-

-							// 4. we use the label to do a set name command on the created element

-

-							// TODO : this class should be in oep.infra.emf.nattable

-							if (createdElement instanceof EObject) {

-								// TODO : this past must be specific for EMF AND for UML

-								EObject eobject = (EObject) createdElement;

-								// get the feature used as ID for the element

-								EStructuralFeature nameFeature = ((EObject) createdElement).eClass().getEStructuralFeature("name"); //$NON-NLS-1$

-								if (nameFeature != null) {

-									SetRequest setNameRequest = new SetRequest(contextEditingDomain, (EObject) createdElement, nameFeature, valueAsString);

-									final IElementEditService createdElementCommandProvider = ElementEditServiceUtils.getCommandProvider(createdElement);

-									if (createdElementCommandProvider != null) {

-										ICommand setName = createdElementCommandProvider.getEditCommand(setNameRequest);

-										if (setName != null && setName.canExecute()) {

-											setName.execute(monitor, info);

-										}

-									}

-								}

-								// we add the created element to the table, only if its parent is the context of the table and if the table is filled by DnD

-								if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0) && ((EObject) createdElement).eContainer() == tableContext) {

-									final Command addCommand = tableManager.getAddRowElementCommand(Collections.singleton(createdElement));

-

-									if (addCommand != null) {// can be null

-										addCommand.execute();

-										addCommand.dispose();

-									}

-								}

-							}

-

-

-							crossCellIteratorToFirstBodyCell(cellIter, nbReadCell);

-

-							while (secondAxisIterator.hasNext() && cellIter.hasNext()) {

-								// we must exit of the header part!

-								valueAsString = cellIter.next();

-

-								final Object currentAxis = secondAxisIterator.next();

-								// valueAsString = cellIter.next();

-								final Object columnObject;

-								final Object rowObject;

-								// if (pasteColumn) {

-								// columnObject = createdElement;

-								// rowObject = currentAxis;

-								// } else {

-								columnObject = currentAxis;

-								rowObject = createdElement;

-								// }

-

-

-								boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject);

-

-								if (isEditable) {

-									final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, pasteHelper.getMultiValueSeparator());

-									final Command setValueCommand = CellManagerFactory.INSTANCE.getSetStringValueCommand(contextEditingDomain, columnObject, rowObject, valueAsString, converter, tableManager);

-									if (setValueCommand != null && setValueCommand.canExecute()) {

-										try {

-											setValueCommand.execute();

-										} catch (Exception e) {

-											// TODO Auto-generated catch block

-											e.printStackTrace();

-										}

-										setValueCommand.dispose();

-									}

-								}

-							}

-

-							int tooManyCellOnRow = 0;

-							while (cellIter.hasNext()) {

-								cellIter.next();// required

-								tooManyCellOnRow++;

-							}

-

-							if (tooManyCellOnRow != 0) {

-								String message = NLS.bind("There are too many cells on the rows number {0}", nbReadLine);

-								IStatus status = new Status(IStatus.WARNING, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_WARNING__TOO_MANY_CELLS_ON_ROWS, message, null);

-								resultStatus.add(status);

-							}

-						}

-					}

-				}

-				progressMonitor.done();

-				localDispose();

-				if (resultStatus.isEmpty()) {

-					return CommandResult.newOKCommandResult();

-				} else {

-					// TODO : use me

-					IStatus resultingStatus = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, resultStatus.toArray(new IStatus[resultStatus.size()]), "The paste has been done, but we found some problems", null);

-					return new CommandResult(resultingStatus);

-				}

-			}

-		};

-		return pasteAllCommand;

-	}

-

-	protected boolean useDetachedMode() {

-		// TODO

-		return false;

-	}

-

-	protected Command getSetNameCommandusingLabel(Object createdElement, String label) {

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @param commandCreationCancelProvider

-	 *            the creation command progress monitor

-	 * @param commandExecutionProgressMonitor

-	 *            the command execution progress monitor

-	 * @return

-	 */

-	private ICommand getPasteFromStringCommandInAttachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {

-		if (this.pasteColumn) {

-			return new UnexecutableCommand(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "We can't paste columns in a tree table"));

-		} else {

-			return getPasteRowFromStringInAttachedModeCommand(contextEditingDomain, tableEditingDomain, progressMonitor);

-		}

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the list of the post actions to do

-	 */

-	private Collection<String> getPostActions() {

-		return this.postActions;

-	}

-

-	/**

-	 * dispose fields of the class

-	 */

-	private void localDispose() {

-		this.isDisposed = true;

-		this.tableManager = null;

-		this.typeToCreate = null;

-		this.containmentFeature = null;

-		for (final AbstractStringValueConverter current : existingConverters.values()) {

-			current.dispose();

-		}

-		this.existingConverters.clear();

-		try {

-			this.reader.close();

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 448065
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.provider;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.EMFCommandOperation;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.commands.CheckedOperationHistory;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;
+import org.eclipse.papyrus.infra.nattable.parsers.CellIterator;
+import org.eclipse.papyrus.infra.nattable.parsers.RowIterator;
+import org.eclipse.papyrus.infra.nattable.paste.IValueSetter;
+import org.eclipse.papyrus.infra.nattable.paste.PastePostActionRegistry;
+import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.PasteSeverityCode;
+import org.eclipse.papyrus.infra.nattable.utils.PasteTreeUtils;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter;
+import org.eclipse.ui.progress.UIJob;
+
+/**
+ * Paste command manager for the paste in the table
+ *
+ * @author VL222926
+ *
+ */
+// TODO : refactor me to create common ancestor with normal paste
+// TODO : refactor me : This class should be in oep.infra.emf.nattable
+public class PasteEObjectTreeAxisInNattableCommandProvider {
+
+	private static final int MIN_AXIS_FOR_PROGRESS_MONITOR = 5;
+
+	/**
+	 * the containment feature to use
+	 */
+	private EStructuralFeature containmentFeature;
+
+	/**
+	 * the type to create
+	 */
+	private IElementType typeToCreate;
+
+	/**
+	 * the table manager
+	 */
+	private INattableModelManager tableManager;
+
+	/**
+	 * the paste mode
+	 */
+	// private PasteEnablementStatus pasteMode;
+
+	/**
+	 * if true, we are pasting in detached mode
+	 */
+	private boolean detachedMode;
+
+	/**
+	 * the list of the post actions do do
+	 */
+	private List<String> postActions;
+
+	/**
+	 * the list of the axis to paste
+	 */
+	// private final String[] axisToPaste;
+
+	/**
+	 * the paste helper
+	 */
+	private final CSVPasteHelper pasteHelper;
+
+	/**
+	 * the converter map
+	 */
+	private Map<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter> existingConverters;
+
+	private static final String PASTE_ACTION_TASK_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteAction;
+
+	private static final String PASTE_ROWS_JOB_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteRows;
+
+	private static final String PASTE_COLUMNS_JOB_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteColumns;
+
+	private static final String PASTE_COMMAND_HAS_BEEN_CANCELLED = Messages.PasteEObjectAxisInTableCommandProvider_CommandCreationHasBeenCancelled;
+
+	private static final String PASTE_COMMAND_CANT_BE_EXECUTED = "The Paste command can't be executed"; //$NON-NLS-1$
+
+	private static final String PASTE_COMMAND_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteFromStringCommand;
+
+	private static final String CREATING_ELEMENT_A_NUMBER_X_Y = Messages.PasteEObjectAxisInTableCommandProvider_CreatingAnumberXonY;
+
+	protected final boolean pasteColumn;
+
+	private final int nbOperationsToDo;
+
+
+	// we refresh the dialog each X read char
+	private int refreshEachReadChar = 1000;
+
+	/**
+	 * if <code>true</code> the command can't be created and executed
+	 */
+	private boolean isDisposed = false;
+
+	/**
+	 * the reader to parse
+	 */
+	private final Reader reader;
+
+	/**
+	 * the parser to use
+	 */
+	private CSVParser parser;
+
+	int factor;
+
+	private Table table;
+
+	final TransactionalEditingDomain tableEditingDomain;
+
+	final TransactionalEditingDomain contextEditingDomain;
+
+	final EObject tableContext;
+
+	List<Object> secondAxis;
+
+	/**
+	 * Determinate if the table contains a single header column or multiple.
+	 */
+	private final boolean isSingleHeaderColumnTreeTable;
+
+	public PasteEObjectTreeAxisInNattableCommandProvider(INattableModelManager tableManager, boolean pasteColumn, Reader reader, CSVPasteHelper pasteHelper2, long totalSize) {
+		this.tableManager = tableManager;
+		// this.pasteMode = status;
+		this.existingConverters = new HashMap<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter>();
+		this.pasteHelper = pasteHelper2;
+		this.reader = reader;
+		this.pasteColumn = pasteColumn;
+		this.table = tableManager.getTable();
+		this.tableContext = table.getContext();
+		tableEditingDomain = TableEditingDomainUtils.getTableEditingDomain(table);
+		contextEditingDomain = TableEditingDomainUtils.getTableContextEditingDomain(table);
+		// TODO improve refresh and progress monitor...
+		long div = -1;
+		if (totalSize > Integer.MAX_VALUE) {
+			div = totalSize / Integer.MAX_VALUE;
+			if (div > Integer.MAX_VALUE) {
+				div = 2 * div;
+			}
+			this.factor = (int) div;
+			this.nbOperationsToDo = (int) (totalSize / div);
+		} else {
+			this.factor = 1;
+			this.nbOperationsToDo = (int) totalSize;
+		}
+		this.isSingleHeaderColumnTreeTable = TableHelper.isSingleColumnTreeTable(table);
+		parser = this.pasteHelper.createParser(reader, isSingleHeaderColumnTreeTable);
+		init();
+	}
+
+	protected List<IPasteConfiguration> getPasteConfigurationFor(int depth) {
+		List<IPasteConfiguration> pasteConfs = new ArrayList<IPasteConfiguration>();
+		for (TreeFillingConfiguration current : FillingConfigurationUtils.getAllTreeFillingConfiguration(table)) {
+			if (current.getDepth() == depth) {
+				IPasteConfiguration pasteConf = current.getPasteConfiguration();
+				Assert.isNotNull(pasteConf);// must not be null here! (so must be verified before
+				pasteConfs.add(pasteConf);
+			}
+		}
+		if (depth == 0 && pasteConfs.size() == 0 && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, depth)) {
+			final IPasteConfiguration conf = (IPasteConfiguration) AxisConfigurationUtils.getIAxisConfigurationUsedInTable(tableManager.getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);
+			pasteConfs.add(conf);
+		}
+		return pasteConfs;
+	}
+
+
+	protected IPasteConfiguration getPasteConfigurationsFor(int depth, String categoryName) {
+		if (depth == 0 && !FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {
+			AbstractHeaderAxisConfiguration conf = table.getLocalRowHeaderAxisConfiguration();
+			if (conf != null) {
+				conf = table.getTableConfiguration().getRowHeaderAxisConfiguration();
+			}
+			List<TreeFillingConfiguration> filling = FillingConfigurationUtils.getAllTreeFillingConfigurationForDepth(table, depth);
+			List<IAxisConfiguration> referencedPasteConf = new ArrayList<IAxisConfiguration>();
+			for (TreeFillingConfiguration tmp : filling) {
+				if (tmp.getPasteConfiguration() != null) {
+					referencedPasteConf.add(tmp.getPasteConfiguration());
+				}
+			}
+			for (IAxisConfiguration axisConf : conf.getOwnedAxisConfigurations()) {
+				if (axisConf instanceof IPasteConfiguration && !referencedPasteConf.contains(axisConf)) {
+					return (IPasteConfiguration) axisConf;
+				}
+			}
+		}
+		for (TreeFillingConfiguration curr : FillingConfigurationUtils.getAllTreeFillingConfiguration(table)) {
+			if (curr.getDepth() == depth) {
+				if (categoryName == null || categoryName.isEmpty()) {
+					return curr.getPasteConfiguration();
+				} else {
+					String featureName = curr.getAxisUsedAsAxisProvider().getAlias();
+					if (featureName == null || "".equals(featureName)) {
+						Object element = curr.getAxisUsedAsAxisProvider().getElement();
+						// TODO : doesn't work for stereotype propertyes
+						// TODO : use label provider
+						if (element instanceof EStructuralFeature) {
+							featureName = ((EStructuralFeature) element).getName();
+						}
+					}
+					if (categoryName.equals(featureName)) {
+						return (IPasteConfiguration) curr.getPasteConfiguration();
+					}
+
+				}
+			}
+		}
+		// TODO : verify category name
+		return null;
+	}
+
+	protected boolean pasteInDetachedMode(Table table) {
+		List<IPasteConfiguration> confs = getPasteConfigurationFor(0);
+		for (IPasteConfiguration current : confs) {
+			if (current.isDetachedMode()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * inits the field of this class
+	 */
+	private void init() {
+		this.detachedMode = pasteInDetachedMode(table);
+		// PasteEObjectConfiguration configuration = null;
+		// if (this.pasteColumn) {
+		// configuration = (PasteEObjectConfiguration) AxisConfigurationUtils.getIAxisConfigurationUsedInTable(this.table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), true);
+		// this.secondAxis = tableManager.getRowElementsList();
+		// } else {
+		//
+		// configuration = (PasteEObjectConfiguration) AxisConfigurationUtils.getIAxisConfigurationUsedInTable(this.table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);
+		this.secondAxis = tableManager.getColumnElementsList();
+		// }
+		// if (configuration != null) {
+		// this.containmentFeature = configuration.getPasteElementContainementFeature();
+		// this.typeToCreate = ElementTypeRegistry.getInstance().getType(configuration.getPastedElementId());
+		// this.postActions = configuration.getPostActions();
+		// this.detachedMode = configuration.isDetachedMode();
+		// }
+	}
+
+	/**
+	 *
+	 * @param useProgressMonitor
+	 *            boolean indicating that we must do the paste with a progress monitor
+	 *            TODO : post actions are not yet supported in the in the detached mode
+	 */
+	public void executePasteFromStringCommand(final boolean useProgressMonitor) {
+		// if (this.pasteColumn) {// not yet supported
+		// return;
+		// }
+		if (this.isDisposed) {
+			throw new RuntimeException("The command provider is disposed"); //$NON-NLS-1$
+		}
+		final String pasteJobName;
+		// if (this.pasteColumn) {
+		// pasteJobName = PASTE_COLUMNS_JOB_NAME;
+		// } else {
+		pasteJobName = PASTE_ROWS_JOB_NAME;
+		// }
+		// if (this.detachedMode) {
+		// executePasteFromStringCommandInDetachedMode(useProgressMonitor, pasteJobName);
+		// } else {
+		executePasteFromStringCommandInAttachedMode(useProgressMonitor, pasteJobName);
+		// }
+	}
+
+
+	/**
+	 *
+	 * @param useProgressMonitor
+	 *            boolean indicating that we must do the paste with a progress monitor
+	 */
+	private void executePasteFromStringCommandInDetachedMode(final boolean useProgressMonitor, final String pasteJobName) {
+		// the map used to share objects between the paste action and the cell value managers
+		final Map<Object, Object> sharedMap = new HashMap<Object, Object>();
+		// the map used to store useful information for the paste
+		sharedMap.put(Constants.PASTED_ELEMENT_CONTAINER_KEY, tableContext);
+		sharedMap.put(Constants.REFERENCES_TO_SET_KEY, new ArrayList<IValueSetter>());
+		sharedMap.put(Constants.CELLS_TO_ADD_KEY, new ArrayList<Cell>());
+
+		// used to be able to apply stereotypes required by columns properties, in detached mode even if there is no post actions defined in the table configuration
+		// see bug 431691: [Table 2] Paste from Spreadsheet must be able to apply required stereotypes for column properties in all usecases
+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=431691
+		sharedMap.put(Constants.ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY, new ArrayList<String>());
+
+		if (!useProgressMonitor) {
+			final ICommand pasteCommand = getPasteFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, new NullProgressMonitor(), sharedMap);
+			try {
+				CheckedOperationHistory.getInstance().execute(pasteCommand, new NullProgressMonitor(), null);
+			} catch (ExecutionException e) {
+				Activator.log.error(e);
+			}
+			sharedMap.clear();
+		} else {
+			// we create a job in order to don't freeze the UI
+			final UIJob job = new UIJob(pasteJobName) {
+
+				@Override
+				public IStatus runInUIThread(IProgressMonitor monitor) {
+
+					final ICommand pasteCommand = getPasteFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, monitor, sharedMap);
+					if (pasteCommand == null) {
+						return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, PASTE_COMMAND_HAS_BEEN_CANCELLED);
+					}
+					// we execute the paste command
+					if (pasteCommand.canExecute()) {
+						try {
+							CheckedOperationHistory.getInstance().execute(pasteCommand, monitor, null);
+						} catch (ExecutionException e) {
+							return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occured during the paste", e); //$NON-NLS-1$
+						} finally {
+							sharedMap.clear();
+						}
+						monitor.done();
+						return Status.OK_STATUS;
+					} else {
+						sharedMap.clear();
+						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, PASTE_COMMAND_CANT_BE_EXECUTED);
+					}
+				}
+			};
+			job.setUser(true);
+			job.schedule();
+		}
+	}
+
+	/**
+	 *
+	 * @param useProgressMonitor
+	 *            boolean indicating that we must do the paste with a progress monitor
+	 */
+	private void executePasteFromStringCommandInAttachedMode(final boolean useProgressMonitor, final String pasteJobName) {
+		if (!useProgressMonitor) {
+			final ICommand pasteCommand = getPasteFromStringCommandInAttachedMode(contextEditingDomain, tableEditingDomain, new NullProgressMonitor());
+			try {
+				CheckedOperationHistory.getInstance().execute(pasteCommand, new NullProgressMonitor(), null);
+			} catch (ExecutionException e) {
+				Activator.log.error(e);
+			}
+		} else {
+			// we create a job in order to don't freeze the UI
+			final UIJob job = new UIJob(pasteJobName) {
+
+				@Override
+				public IStatus runInUIThread(IProgressMonitor monitor) {
+
+					final ICommand pasteCommand = getPasteFromStringCommandInAttachedMode(contextEditingDomain, tableEditingDomain, monitor);
+					if (pasteCommand == null) {
+						return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, PASTE_COMMAND_HAS_BEEN_CANCELLED);
+					}
+					// we execute the paste command
+					if (pasteCommand.canExecute()) {
+						try {
+
+
+							EMFCommandOperation op = new EMFCommandOperation(contextEditingDomain, new GMFtoEMFCommandWrapper(pasteCommand));
+							// EMFOperationCommand c = new EMFOperationCommand(contextEditingDomain, pasteCommand);
+							CheckedOperationHistory.getInstance().execute(op, monitor, null);
+						} catch (Exception e) {
+							return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occured during the paste", e); //$NON-NLS-1$
+						}
+						monitor.done();
+						return Status.OK_STATUS;
+					} else {
+						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, PASTE_COMMAND_CANT_BE_EXECUTED);
+					}
+				}
+			};
+			job.setUser(true);
+			job.schedule();
+		}
+	}
+
+	private ICommand getPasteRowFromStringCommandInDetachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor, final Map<Object, Object> sharedMap) {
+		if (progressMonitor != null) {
+			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);// +1 to add the created elements to the table
+		}
+		// the list of the created elements
+		final List<Object> createdElements = new ArrayList<Object>();
+
+		// 2.2 create the creation request and find the command provider
+		final EClass eClassToCreate = this.typeToCreate.getEClass();
+		final EFactory eFactory = eClassToCreate.getEPackage().getEFactoryInstance();
+
+		// 2.3 create the axis
+		int nbCreatedElements = 0;
+
+		// we refresh the dialog each X read char
+		long readChar = 0;
+		long previousreadChar = 0;
+		final RowIterator rowIter = this.parser.parse();
+		while (rowIter.hasNext()) {
+			final CellIterator cellIter = rowIter.next();
+			if (!cellIter.hasNext()) {
+				continue;// to avoid blank line
+			}
+			if ((progressMonitor != null) && progressMonitor.isCanceled()) {
+				// the user click on the cancel button
+				return null;
+			}
+
+			readChar = readChar + (parser.getReadCharacters() - previousreadChar);
+			previousreadChar = parser.getReadCharacters();
+
+
+			if (progressMonitor != null && readChar > refreshEachReadChar) {
+				readChar = 0;
+				progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[] { nbCreatedElements, typeToCreate.getEClass().getName() })); //$NON-NLS-1$
+				progressMonitor.worked(refreshEachReadChar);
+			}
+			nbCreatedElements++;
+
+			// 2.3.3 we create the element itself
+			final EObject createdElement = eFactory.create(eClassToCreate);
+
+			createdElements.add(createdElement);
+			nbCreatedElements++;
+			for (final String currentPostActions : this.postActions) {
+				PastePostActionRegistry.INSTANCE.doPostAction(this.tableManager, currentPostActions, tableContext, createdElement, sharedMap, null);// TODO : remove this parameter
+			}
+
+			// 2.3.4 we set these properties values
+			final Iterator<Object> secondAxisIterator = secondAxis.iterator();
+			while (secondAxisIterator.hasNext() && cellIter.hasNext()) {
+				final Object currentAxis = secondAxisIterator.next();
+				final String valueAsString = cellIter.next();
+				final Object columnObject;
+				final Object rowObject;
+				if (this.pasteColumn) {
+					columnObject = createdElement;
+					rowObject = currentAxis;
+				} else {
+					columnObject = currentAxis;
+					rowObject = createdElement;
+				}
+
+
+				boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject, sharedMap);
+				if (isEditable) {
+					final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, this.pasteHelper.getMultiValueSeparator());
+					CellManagerFactory.INSTANCE.setStringValue(columnObject, rowObject, valueAsString, converter, tableManager, sharedMap);
+				}
+			}
+
+			// TODO : do something to say that the number of cell is not correct!
+			while (cellIter.hasNext()) {
+				cellIter.next();// required!
+			}
+		}
+
+		// 2.4 we add the created elements to the table
+		final AbstractTransactionalCommand pasteCommand = new AbstractTransactionalCommand(tableEditingDomain, PASTE_COMMAND_NAME, null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				// initialize lists
+				final Collection<String> postActions = getPostActions();
+
+				// we add the post actions added by cell manager
+				// see bug 431691: [Table 2] Paste from Spreadsheet must be able to apply required stereotypes for column properties in all usecases
+				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=431691
+				@SuppressWarnings("unchecked")
+				final Collection<String> postActionsAddedByCellManagers = (Collection<String>) sharedMap.get(Constants.ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY);
+				postActions.addAll(postActionsAddedByCellManagers);
+
+				@SuppressWarnings("unchecked")
+				final List<Cell> cells = (List<Cell>) sharedMap.get(Constants.CELLS_TO_ADD_KEY);
+				@SuppressWarnings("unchecked")
+				final List<IValueSetter> valueToSet = (List<IValueSetter>) sharedMap.get(Constants.REFERENCES_TO_SET_KEY);
+
+				int nbTasks = 1; // to add created elements to the model
+				nbTasks = nbTasks + 1; // to add createds elements to the table
+				nbTasks = nbTasks + postActions.size();// to do post actions after the attachment to the model
+				nbTasks = nbTasks + 1; // to attach the cells to the model
+				nbTasks = nbTasks + valueToSet.size(); // to set the references values
+
+				if (progressMonitor != null) {
+					if (progressMonitor.isCanceled()) {
+						localDispose();
+						return CommandResult.newCancelledCommandResult();
+					}
+					progressMonitor.beginTask(Messages.PasteEObjectAxisInTableCommandProvider_FinishingThePaste, nbTasks);
+				}
+
+				// 1. Add the elements to the context
+				AddCommand.create(contextEditingDomain, tableContext, containmentFeature, createdElements).execute();
+
+				if (progressMonitor != null) {
+					if (progressMonitor.isCanceled()) {
+						return CommandResult.newCancelledCommandResult();
+					}
+					progressMonitor.worked(1);
+					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_AddingElementToTheTable);
+				}
+
+				Command cmd = null;
+				if (pasteColumn) {
+					cmd = tableManager.getAddColumnElementCommand(createdElements); // TODO remove one of these 2 lines
+				} else {
+					cmd = tableManager.getAddRowElementCommand(createdElements);
+				}
+				if (cmd != null) {// could be null
+					cmd.execute();
+				}
+
+				if (progressMonitor != null) {
+					if (progressMonitor.isCanceled()) {
+						return CommandResult.newCancelledCommandResult();
+					}
+					progressMonitor.worked(1);
+					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_DoingAdditionalActions);
+				}
+
+
+				for (final String currentPostActions : postActions) {
+					PastePostActionRegistry.INSTANCE.concludePostAction(tableManager, currentPostActions, sharedMap);
+					progressMonitor.worked(1);
+				}
+
+
+				if (progressMonitor != null) {
+					if (progressMonitor.isCanceled()) {
+						return CommandResult.newCancelledCommandResult();
+					}
+					progressMonitor.worked(1);
+					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_LinkingReferencesToTheModel);
+				}
+
+				// we set the references
+
+				if (valueToSet.size() > 0) {
+					for (final IValueSetter current : valueToSet) {
+						current.doSetValue(contextEditingDomain);
+						if (progressMonitor != null) {
+							if (progressMonitor.isCanceled()) {
+								return CommandResult.newCancelledCommandResult();
+							}
+							progressMonitor.worked(1);
+						}
+					}
+				}
+
+				// the cells must be attached at the end (in order to update properly the cell map in the table manager
+				if (progressMonitor != null) {
+					if (progressMonitor.isCanceled()) {
+						return CommandResult.newCancelledCommandResult();
+					}
+					progressMonitor.worked(1);
+				}
+
+				// add the created cells to the table
+				AddCommand.create(tableEditingDomain, table, NattablePackage.eINSTANCE.getTable_Cells(), cells).execute();
+
+				if (progressMonitor != null) {
+					progressMonitor.done();
+				}
+				localDispose();
+				return CommandResult.newOKCommandResult();
+			}
+		};
+
+		return pasteCommand;
+	}
+
+
+	/**
+	 *
+	 *
+	 * @param sharedMap
+	 *            a map used to share objects and informations during the paste between this class and the cell value manager
+	 * @param commandCreationCancelProvider
+	 *            the creation command progress monitor
+	 * @param commandExecutionProgressMonitor
+	 *            the command execution progress monitor
+	 * @return
+	 *         the command to use to finish the paste (the main part of the paste is directly done here)
+	 */
+	private ICommand getPasteFromStringCommandInDetachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor, final Map<Object, Object> sharedMap) {
+		if (!this.pasteColumn) {
+			return getPasteRowFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, progressMonitor, sharedMap);
+		} else {
+			// return getPasteColumnFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, progressMonitor, sharedMap);
+		}
+		return null;
+	}
+
+
+	//
+	// /**
+	// *
+	// * @param commandCreationCancelProvider
+	// * the creation command progress monitor
+	// * @param commandExecutionProgressMonitor
+	// * the command execution progress monitor
+	// * @return
+	// */
+	// private ICommand getPasteColumnFromStringInAttachedModeCommand(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {
+	// // initialize the progress monitor
+	// if (progressMonitor != null) {
+	// progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);
+	// }
+	//
+	// // 2.2 create the creation request and find the command provider
+	// final CreateElementRequest createRequest = new CreateElementRequest(contextEditingDomain, this.tableContext, this.typeToCreate, (EReference) this.containmentFeature);
+	// final IElementEditService tableContextCommandProvider = ElementEditServiceUtils.getCommandProvider(tableContext);
+	//
+	// final ICommand pasteAllCommand = new AbstractTransactionalCommand(contextEditingDomain, PASTE_COMMAND_NAME, null) {
+	//
+	//
+	// /**
+	// *
+	// * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+	// *
+	// * @param monitor
+	// * @param info
+	// * @return
+	// * @throws ExecutionException
+	// */
+	// @Override
+	// protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+	// long readChar = 0;
+	// long previousreadChar = 0;
+	//
+	// final RowIterator rowIter = parser.parse();
+	// int nbCreatedElements = 0;
+	// while (rowIter.hasNext()) {
+	// final CellIterator cellIter = rowIter.next();
+	// if (!cellIter.hasNext()) {
+	// continue;// to avoid blank line
+	// }
+	// if (progressMonitor != null && progressMonitor.isCanceled()) {
+	// progressMonitor.done();
+	// localDispose();
+	// return CommandResult.newCancelledCommandResult();
+	// }
+	// readChar = readChar + (parser.getReadCharacters() - previousreadChar);
+	// previousreadChar = parser.getReadCharacters();
+	// if (progressMonitor != null && readChar > refreshEachReadChar) {
+	// readChar = 0;
+	//						progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[] { typeToCreate.getEClass().getName(), nbCreatedElements })); //$NON-NLS-1$
+	// progressMonitor.worked(refreshEachReadChar);
+	// }
+	// nbCreatedElements++;
+	// final ICommand commandCreation = tableContextCommandProvider.getEditCommand(createRequest);
+	// if (commandCreation.canExecute()) {
+	// // 1. we create the element
+	// commandCreation.execute(monitor, info);
+	// // we execute the creation command
+	//
+	// // 2. we add it to the table
+	// final CommandResult res = commandCreation.getCommandResult();
+	// commandCreation.dispose();
+	//
+	// final Object createdElement = res.getReturnValue();
+	// final Command addCommand;
+	// if (pasteColumn) {
+	// addCommand = tableManager.getAddColumnElementCommand(Collections.singleton(createdElement));
+	// } else {
+	// addCommand = tableManager.getAddRowElementCommand(Collections.singleton(createdElement));
+	// }
+	// if (addCommand != null) {// can be null
+	// addCommand.execute();
+	// addCommand.dispose();
+	// }
+	//
+	// // 3. we set the values
+	// final Iterator<?> secondAxisIterator = secondAxis.iterator();
+	// while (secondAxisIterator.hasNext() && cellIter.hasNext()) {
+	// final Object currentAxis = secondAxisIterator.next();
+	// final String valueAsString = cellIter.next();
+	// final Object columnObject;
+	// final Object rowObject;
+	// if (pasteColumn) {
+	// columnObject = createdElement;
+	// rowObject = currentAxis;
+	// } else {
+	// columnObject = currentAxis;
+	// rowObject = createdElement;
+	// }
+	//
+	//
+	// boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject);
+	//
+	// if (isEditable) {
+	// final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, pasteHelper.getMultiValueSeparator());
+	// final Command setValueCommand = CellManagerFactory.INSTANCE.getSetStringValueCommand(contextEditingDomain, columnObject, rowObject, valueAsString, converter, tableManager);
+	// if (setValueCommand != null && setValueCommand.canExecute()) {
+	// setValueCommand.execute();
+	// setValueCommand.dispose();
+	// }
+	// }
+	// }
+	// // TODO inform the user
+	// while (cellIter.hasNext()) {
+	// cellIter.next();// required
+	// }
+	// }
+	// }
+	// progressMonitor.done();
+	// localDispose();
+	// return CommandResult.newOKCommandResult();
+	// }
+	// };
+	// return pasteAllCommand;
+	// }
+
+
+
+
+
+	private boolean isCategory(int nbReadCell) {
+		return PasteTreeUtils.isCategory(nbReadCell, FillingConfigurationUtils.getMaxDepthForTree(table), StyleUtils.getHiddenDepths(table), FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0));
+	}
+
+
+	private int getDepth(int nbReadCell) {
+		return PasteTreeUtils.getDepth(nbReadCell, FillingConfigurationUtils.getMaxDepthForTree(table), StyleUtils.getHiddenDepths(table), FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0));
+	}
+
+	/**
+	 * 
+	 * @param iterator
+	 *            the cellIterator
+	 * @param nbReadCell
+	 * 
+	 */
+	protected void crossCellIteratorToFirstBodyCell(CellIterator cellIter, int nbReadCell) {
+		// If this is a single column header tree table, we don't need to do anything, only the first column is used for the header in the excel spearsheet
+		if (!TableHelper.isSingleColumnTreeTable(table)) {
+			int nbColumns = (FillingConfigurationUtils.getMaxDepthForTree(table) + 1) * 2;
+			if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0)) {
+				nbColumns--;
+			}
+
+			// exit of the header part
+			List<Integer> hiddenDepth = StyleUtils.getHiddenDepths(table);
+			int nbVisibleColumns = nbColumns - hiddenDepth.size();
+
+			while (nbReadCell < nbVisibleColumns) {
+				cellIter.next();
+				nbReadCell++;
+			}
+		}
+
+	}
+
+	/**
+	 *
+	 * @param commandCreationCancelProvider
+	 *            the creation command progress monitor
+	 * @param commandExecutionProgressMonitor
+	 *            the command execution progress monitor
+	 * @return
+	 */
+	private ICommand getPasteRowFromStringInAttachedModeCommand(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {
+		// initialize the progress monitor
+		if (progressMonitor != null) {
+			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);
+		}
+
+		final boolean isSingleHeaderColumnTreeTable = TableHelper.isSingleColumnTreeTable(table);
+
+		// 2.2 create the creation request and find the command provider
+		final ICommand pasteAllCommand = new AbstractTransactionalCommand(contextEditingDomain, PASTE_COMMAND_NAME, null) {
+
+			/**
+			 * The character of the indentation for the single column.
+			 */
+			private static final char INDENTATION_CHARACTER = ' '; // $NON-NLS-1$
+
+			/**
+			 *
+			 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+			 *
+			 * @param monitor
+			 * @param info
+			 * @return
+			 * @throws ExecutionException
+			 */
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				List<IStatus> resultStatus = new ArrayList<IStatus>();
+
+				long readChar = 0;
+				long previousreadChar = 0;
+
+				// this map stores the last created object to a depth.
+				// its allows us to find easily the context to use for each created element
+				Map<Integer, EObject> contextMap = new HashMap<Integer, EObject>();
+				contextMap.put(Integer.valueOf(-1), table.getContext());
+
+				// 2. create a map with the last paste configuration used by depth
+				Map<Integer, PasteEObjectConfiguration> confMap = new HashMap<Integer, PasteEObjectConfiguration>();
+
+				final RowIterator rowIter = parser.parse();
+				int nbCreatedElements = 0;
+				int nbReadLine = 0;
+				while (rowIter.hasNext()) {
+					final CellIterator cellIter = rowIter.next();
+					nbReadLine++;
+					if (!cellIter.hasNext()) {
+						continue;// to avoid blank line
+					}
+					if (progressMonitor != null && progressMonitor.isCanceled()) {
+						progressMonitor.done();
+						localDispose();
+						return CommandResult.newCancelledCommandResult();
+					}
+					readChar = readChar + (parser.getReadCharacters() - previousreadChar);
+					previousreadChar = parser.getReadCharacters();
+
+					if (progressMonitor != null && readChar > refreshEachReadChar) {
+						readChar = 0;
+						// TODO : uncomment me, and move me, NPE on typeToCreate
+						// progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[] { typeToCreate.getEClass().getName(), nbCreatedElements })); //$NON-NLS-1$
+						progressMonitor.worked(refreshEachReadChar);
+					}
+
+					// the iterator on columns
+					final Iterator<?> secondAxisIterator = secondAxis.iterator();
+
+
+					while (cellIter.hasNext()) {
+						String valueAsString = cellIter.next();
+						int nbReadCell = 1;
+
+						if (isSingleHeaderColumnTreeTable && !valueAsString.isEmpty()) {
+							// If the table is a single header column, parse the value string to manage the correct depth
+							// (manage each separator character as empty cell)
+							while (INDENTATION_CHARACTER == valueAsString.charAt(0)) {
+								nbReadCell++;
+								valueAsString = valueAsString.substring(1);
+							}
+						} else {
+							// test if the value is empty (we are in the tree header)
+							while (cellIter.hasNext() && valueAsString.isEmpty()) {
+								valueAsString = cellIter.next();
+								nbReadCell++;
+							}
+							// Remove the whitespace on beginning
+							if(isSingleHeaderColumnTreeTable && !valueAsString.isEmpty()){
+								while (INDENTATION_CHARACTER == valueAsString.charAt(0)) {
+									valueAsString = valueAsString.substring(1);
+								}
+							}
+						}
+
+						int depth = -1;
+						boolean isCategory = false;
+						try {
+							depth = getDepth(nbReadCell);
+							isCategory = isCategory(nbReadCell);
+						} catch (UnsupportedOperationException ex) {
+							String message = NLS.bind("No defined depth for line {0}", nbReadCell); //$NON-NLS-1$
+							// The following lines allows to cancel all the paste if a problem of depth appears
+							// If a partial paste is authorized, remove this lines
+							Activator.log.error(message, ex);
+							IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_ERROR__MORE_LINES_THAN_DEPTH, message, null);
+							return new CommandResult(status);
+						}
+
+						if (isCategory) {
+							confMap.put(Integer.valueOf(depth), (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, valueAsString));
+							// lastConfiguration = (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, valueAsString);
+							while (cellIter.hasNext()) {
+								cellIter.next();
+							}
+							break;
+						}
+
+						// we get the paste configuration to use
+						PasteEObjectConfiguration pasteConfToUse = (PasteEObjectConfiguration) confMap.get(Integer.valueOf(depth));
+						if (pasteConfToUse == null) {
+							pasteConfToUse = (PasteEObjectConfiguration) getPasteConfigurationsFor(depth, null);
+							if (pasteConfToUse != null) {
+								confMap.put(Integer.valueOf(depth), pasteConfToUse);
+							} else {
+								IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_ERROR__NO_PASTE_CONFIGURATION, NLS.bind("No paste configuration found for the depth {0}", depth), null);
+								return new CommandResult(status);
+							}
+						}
+						// get the paste configuration to use
+
+						// get the element type to use to create the element
+						IElementType typeToCreate = ElementTypeRegistry.getInstance().getType(pasteConfToUse.getPastedElementId());
+
+						EStructuralFeature containmentFeature = pasteConfToUse.getPasteElementContainementFeature();
+
+						// get the context to use
+						EObject context = contextMap.get(depth - 1);
+						final CreateElementRequest createRequest1 = new CreateElementRequest(contextEditingDomain, context, typeToCreate, (EReference) containmentFeature);
+						final IElementEditService creationContextCommandProvider = ElementEditServiceUtils.getCommandProvider(context);
+
+						final ICommand commandCreation = creationContextCommandProvider.getEditCommand(createRequest1);
+						if (null != commandCreation && commandCreation.canExecute()) {
+
+							// 1. we create the element
+							commandCreation.execute(monitor, info);
+							nbCreatedElements++;
+
+							// 2. we get the result of the command
+							final CommandResult res = commandCreation.getCommandResult();
+							commandCreation.dispose();
+
+							// 3 we update the map
+							final Object createdElement = res.getReturnValue();
+							contextMap.put(Integer.valueOf(depth), (EObject) createdElement);
+
+							// 4. we use the label to do a set name command on the created element
+
+							// TODO : this class should be in oep.infra.emf.nattable
+							if (createdElement instanceof EObject) {
+								// TODO : this past must be specific for EMF AND for UML
+								EObject eobject = (EObject) createdElement;
+								// get the feature used as ID for the element
+								EStructuralFeature nameFeature = ((EObject) createdElement).eClass().getEStructuralFeature("name"); //$NON-NLS-1$
+								if (nameFeature != null) {
+									SetRequest setNameRequest = new SetRequest(contextEditingDomain, (EObject) createdElement, nameFeature, valueAsString);
+									final IElementEditService createdElementCommandProvider = ElementEditServiceUtils.getCommandProvider(createdElement);
+									if (createdElementCommandProvider != null) {
+										ICommand setName = createdElementCommandProvider.getEditCommand(setNameRequest);
+										if (setName != null && setName.canExecute()) {
+											setName.execute(monitor, info);
+										}
+									}
+								}
+								// we add the created element to the table, only if its parent is the context of the table and if the table is filled by DnD
+								if (!FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(table, 0) && ((EObject) createdElement).eContainer() == tableContext) {
+									final Command addCommand = tableManager.getAddRowElementCommand(Collections.singleton(createdElement));
+
+									if (addCommand != null) {// can be null
+										addCommand.execute();
+										addCommand.dispose();
+									}
+								}
+							}
+
+
+							crossCellIteratorToFirstBodyCell(cellIter, nbReadCell);
+
+							while (secondAxisIterator.hasNext() && cellIter.hasNext()) {
+								// we must exit of the header part!
+								valueAsString = cellIter.next();
+								// Remove the whitespace on beginning
+								if(isSingleHeaderColumnTreeTable && !valueAsString.isEmpty()){
+									while (INDENTATION_CHARACTER == valueAsString.charAt(0)) {
+										valueAsString = valueAsString.substring(1);
+									}
+								}
+
+								final Object currentAxis = secondAxisIterator.next();
+								// valueAsString = cellIter.next();
+								final Object columnObject;
+								final Object rowObject;
+								// if (pasteColumn) {
+								// columnObject = createdElement;
+								// rowObject = currentAxis;
+								// } else {
+								columnObject = currentAxis;
+								rowObject = createdElement;
+								// }
+
+
+								boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject);
+
+								if (isEditable) {
+									final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, pasteHelper.getMultiValueSeparator());
+									final Command setValueCommand = CellManagerFactory.INSTANCE.getSetStringValueCommand(contextEditingDomain, columnObject, rowObject, valueAsString, converter, tableManager);
+									if (setValueCommand != null && setValueCommand.canExecute()) {
+										try {
+											setValueCommand.execute();
+										} catch (Exception e) {
+											// TODO Auto-generated catch block
+											e.printStackTrace();
+										}
+										setValueCommand.dispose();
+									}
+								}
+							}
+
+							int tooManyCellOnRow = 0;
+							while (cellIter.hasNext()) {
+								cellIter.next();// required
+								tooManyCellOnRow++;
+							}
+
+							if (tooManyCellOnRow != 0) {
+								String message = NLS.bind("There are too many cells on the rows number {0}", nbReadLine);
+								IStatus status = new Status(IStatus.WARNING, Activator.PLUGIN_ID, PasteSeverityCode.PASTE_WARNING__TOO_MANY_CELLS_ON_ROWS, message, null);
+								resultStatus.add(status);
+							}
+						}
+					}
+				}
+				progressMonitor.done();
+				localDispose();
+				if (resultStatus.isEmpty()) {
+					return CommandResult.newOKCommandResult();
+				} else {
+					// TODO : use me
+					IStatus resultingStatus = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, resultStatus.toArray(new IStatus[resultStatus.size()]), "The paste has been done, but we found some problems", null);
+					return new CommandResult(resultingStatus);
+				}
+			}
+		};
+		return pasteAllCommand;
+	}
+
+	protected boolean useDetachedMode() {
+		// TODO
+		return false;
+	}
+
+	protected Command getSetNameCommandusingLabel(Object createdElement, String label) {
+
+		return null;
+	}
+
+	/**
+	 *
+	 * @param commandCreationCancelProvider
+	 *            the creation command progress monitor
+	 * @param commandExecutionProgressMonitor
+	 *            the command execution progress monitor
+	 * @return
+	 */
+	private ICommand getPasteFromStringCommandInAttachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {
+		if (this.pasteColumn) {
+			return new UnexecutableCommand(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "We can't paste columns in a tree table"));
+		} else {
+			return getPasteRowFromStringInAttachedModeCommand(contextEditingDomain, tableEditingDomain, progressMonitor);
+		}
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the list of the post actions to do
+	 */
+	private Collection<String> getPostActions() {
+		return this.postActions;
+	}
+
+	/**
+	 * dispose fields of the class
+	 */
+	private void localDispose() {
+		this.isDisposed = true;
+		this.tableManager = null;
+		this.typeToCreate = null;
+		this.containmentFeature = null;
+		for (final AbstractStringValueConverter current : existingConverters.values()) {
+			current.dispose();
+		}
+		this.existingConverters.clear();
+		try {
+			this.reader.close();
+		} catch (IOException e) {
+			Activator.log.error(e);
+		}
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java
index 5570f0cf114..80f77347d17 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java
@@ -1,96 +1,110 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * 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:

- *

- *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

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

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import java.io.Reader;

-

-import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;

-import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;

-import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;

-

-/**

- *

- * This class provides utils method to split a string to do a paste in the table

- *

- */

-public class CSVPasteHelper {

-

-	/**

-	 * the default separator used for columns

-	 */

-	public static final char DEFAULT_CLIPBOARD_COLUMN_SEPARATOR = PasteSeparator.TABULATION.getSeparator();

-

-	/**

-	 * the default separator used for multivalue

-	 */

-	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

-

-	public static final char DEFAULT_TEXT_MARKER = TextDelimiter.DOUBLE_QUOTE.getDelimiter();

-

-	private final char textMarker;

-

-	private final char cellSeparator;

-

-	private final String multiValueSeparator;

-

-

-	/**

-	 *

-	 * Constructor.

-	 * The default constructor initialize the class with {@value #DEFAULT_CLIPBOARD_COLUMN_SEPARATOR}, {@value #DEFAULT_TEXT_MARKER}, {@value #DEFAULT_MULTI_VALUE_SEPARATOR}

-	 */

-	public CSVPasteHelper() {

-		this(DEFAULT_CLIPBOARD_COLUMN_SEPARATOR, DEFAULT_TEXT_MARKER, DEFAULT_MULTI_VALUE_SEPARATOR);

-	}

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param cellSeparator

-	 *            the column separator to use

-	 * @param textMarked

-	 *            the row separator to use

-	 * @param textMarker

-	 *            the multi value separator to use

-	 */

-	public CSVPasteHelper(final char cellSeparator, final char textMarker, final String multiValueSeparator) {

-		this.cellSeparator = cellSeparator;

-		this.textMarker = textMarker;

-		this.multiValueSeparator = multiValueSeparator;

-	}

-

-	/**

-	 *

-	 * @param reader

-	 *            a reader

-	 * @return

-	 *         create a parser from the reader

-	 */

-	public CSVParser createParser(final Reader reader) {

-		return new CSVParser(reader, this.cellSeparator, textMarker);

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the separator used for multivalue

-	 */

-	public String getMultiValueSeparator() {

-		return multiValueSeparator;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * 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:
+ *
+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.utils;
+
+import java.io.Reader;
+
+import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;
+import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;
+import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;
+
+/**
+ *
+ * This class provides utils method to split a string to do a paste in the table
+ *
+ */
+public class CSVPasteHelper {
+
+	/**
+	 * the default separator used for columns
+	 */
+	public static final char DEFAULT_CLIPBOARD_COLUMN_SEPARATOR = PasteSeparator.TABULATION.getSeparator();
+
+	/**
+	 * the default separator used for multivalue
+	 */
+	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$
+
+	public static final char DEFAULT_TEXT_MARKER = TextDelimiter.DOUBLE_QUOTE.getDelimiter();
+
+	private final char textMarker;
+
+	private final char cellSeparator;
+
+	private final String multiValueSeparator;
+
+
+	/**
+	 *
+	 * Constructor.
+	 * The default constructor initialize the class with {@value #DEFAULT_CLIPBOARD_COLUMN_SEPARATOR}, {@value #DEFAULT_TEXT_MARKER}, {@value #DEFAULT_MULTI_VALUE_SEPARATOR}
+	 */
+	public CSVPasteHelper() {
+		this(DEFAULT_CLIPBOARD_COLUMN_SEPARATOR, DEFAULT_TEXT_MARKER, DEFAULT_MULTI_VALUE_SEPARATOR);
+	}
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param cellSeparator
+	 *            the column separator to use
+	 * @param textMarked
+	 *            the row separator to use
+	 * @param textMarker
+	 *            the multi value separator to use
+	 */
+	public CSVPasteHelper(final char cellSeparator, final char textMarker, final String multiValueSeparator) {
+		this.cellSeparator = cellSeparator;
+		this.textMarker = textMarker;
+		this.multiValueSeparator = multiValueSeparator;
+	}
+
+	/**
+	 * Create the CSV Parser.
+	 *
+	 * @param reader
+	 *            a reader
+	 * @return
+	 *         create a parser from the reader
+	 */
+	public CSVParser createParser(final Reader reader) {
+		return createParser(reader, false);
+	}
+
+	/**
+	 * Create the CSV Parser with the boolean for the beginning whitespace.
+	 *
+	 * @param reader
+	 *            a reader
+	 * @param keepBeginningWhiteSpace
+	 *            Boolean to determinate if the beginning string whitespace must be kept or removed
+	 * @return
+	 * 		create a parser from the reader
+	 */
+	public CSVParser createParser(final Reader reader, final boolean keepBeginningWhiteSpace) {
+		return new CSVParser(reader, this.cellSeparator, textMarker, keepBeginningWhiteSpace);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the separator used for multivalue
+	 */
+	public String getMultiValueSeparator() {
+		return multiValueSeparator;
+	}
+
+
+}
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 {