diff --git a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
index 8b96372..7678d2f 100644
--- a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
@@ -5,149 +5,149 @@
 Bundle-Version: 1.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.nebula.widgets.nattable;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.blink;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.blink.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.blink.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnCategories;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnCategories.gui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnChooser;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnChooser.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnChooser.gui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnRename;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.columnRename.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.conflation;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.coordinate;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.copy.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.copy.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.copy.serializing;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.data;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.data.convert;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.data.validate;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit.editor;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.edit.gui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.export;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.export.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.export.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.export.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.export.excel;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.filterrow;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.filterrow.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.filterrow.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.filterrow.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.filterrow.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.freeze;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.freeze.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.freeze.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.freeze.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.freeze.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid.cell;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid.data;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid.layer;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid.layer.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.grid.layer.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.gui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.model;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.group.painter;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hideshow;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hideshow.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hideshow.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hover;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hover.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hover.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.hover.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.layer;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.layer.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.layer.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.layer.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.layer.stack;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.painter;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.painter.layer;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.persistence;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.persistence.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.persistence.gui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.print;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.print.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.print.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.print.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.reorder;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.reorder.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.reorder.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.reorder.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.reorder.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.resize;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.resize.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.resize.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.resize.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.resize.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.resize.mode;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search.gui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.search.strategy;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.selection;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.selection.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.selection.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.selection.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.selection.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.selection.preserve;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.serializing;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.sort;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.sort.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.sort.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.sort.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.sort.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.sort.painter;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.style;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.style.editor;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.style.editor.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.style.theme;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.summaryrow;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.summaryrow.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tickupdate;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tickupdate.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tickupdate.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tickupdate.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tooltip;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tree;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tree.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tree.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tree.config;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.tree.painter;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui.binding;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui.matcher;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui.menu;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui.mode;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.ui.util;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.util;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.viewport;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.viewport.action;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.viewport.command;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.viewport.event;version="1.2.0",
- org.eclipse.nebula.widgets.nattable.widget;version="1.2.0"
+Export-Package: org.eclipse.nebula.widgets.nattable;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.blink;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.blink.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.blink.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnCategories;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnCategories.gui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnChooser;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnChooser.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnChooser.gui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnRename;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.columnRename.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.conflation;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.coordinate;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.copy.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.copy.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.copy.serializing;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.data;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.data.validate;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit.editor;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.edit.gui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.export;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.export.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.export.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.export.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.export.excel;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.filterrow;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.filterrow.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.freeze;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.freeze.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.freeze.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.freeze.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.freeze.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid.cell;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid.data;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid.layer;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid.layer.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.grid.layer.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.gui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.model;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.group.painter;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hideshow;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hideshow.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hideshow.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hover;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hover.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hover.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.hover.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.layer;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.layer.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.layer.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.layer.stack;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.painter;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.painter.layer;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.persistence;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.persistence.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.persistence.gui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.print;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.print.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.print.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.print.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.reorder;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.reorder.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.reorder.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.reorder.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.reorder.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.resize;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.resize.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.resize.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.resize.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.resize.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.resize.mode;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search.gui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.search.strategy;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.selection;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.selection.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.selection.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.selection.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.selection.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.selection.preserve;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.serializing;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.sort;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.sort.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.sort.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.sort.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.sort.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.sort.painter;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.style;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.style.editor;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.style.editor.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.style.theme;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.summaryrow;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.summaryrow.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tickupdate.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tooltip;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tree;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tree.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tree.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tree.config;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.tree.painter;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.binding;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.matcher;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.menu;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.mode;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.rendering;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.ui.util;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.util;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.viewport;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.viewport.action;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.viewport.command;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.viewport.event;version="2.0.0",
+ org.eclipse.nebula.widgets.nattable.widget;version="2.0.0"
 Import-Package: org.apache.commons.logging;version="[1.0.0,2.0.0)",
  org.eclipse.core.commands.common,
  org.eclipse.jface.action,
diff --git a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF
index 378d35f..29dc646 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.glazedlists/META-INF/MANIFEST.MF
@@ -15,54 +15,54 @@
 Import-Package: org.apache.commons.codec;version="[1.3.0,2.0.0)",
  org.apache.commons.codec.binary;version="[1.3.0,2.0.0)",
  org.apache.commons.logging;version="[1.0.0,2.0.0)",
- org.eclipse.nebula.widgets.nattable;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.blink;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.config;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.coordinate;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.data;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.data.convert;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.edit;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.edit.action;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.edit.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.edit.editor;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.filterrow;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.filterrow.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.filterrow.config;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.grid;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.grid.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.grid.data;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.grid.layer;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.hideshow;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.hideshow.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.hideshow.event;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.layer;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.layer.event;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.layer.stack;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.persistence;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.reorder.action;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.search.event;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.sort;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.sort.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.sort.config;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.sort.event;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.sort.painter;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.style;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.style.theme;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.summaryrow;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.summaryrow.command;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.tree;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.ui;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.ui.action;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.ui.binding;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.ui.matcher;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.ui.menu;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.ui.util;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.util;version="[1.2.0,1.3.0)",
+ org.eclipse.nebula.widgets.nattable;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.blink;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.config;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.coordinate;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.data;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.data.convert;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.edit;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.edit.action;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.edit.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.edit.editor;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow.combobox;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.filterrow.config;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.grid;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.grid.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.grid.data;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.grid.layer;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.hideshow.event;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.layer;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.layer.event;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.layer.stack;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.persistence;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.reorder.action;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.search.event;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.sort;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.sort.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.sort.config;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.sort.event;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.sort.painter;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.style;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.style.theme;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.summaryrow;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.summaryrow.command;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.tree;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.ui;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.ui.action;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.ui.binding;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.ui.matcher;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.ui.menu;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.ui.util;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.util;version="[2.0.0,2.1.0)",
  org.eclipse.swt,
  org.eclipse.swt.custom,
  org.eclipse.swt.events,
diff --git a/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
index d9f9a50..d6bb1e8 100644
--- a/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.extension.poi/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
 Bundle-Version: 1.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.nebula.widgets.nattable.extension.poi;version="1.1.0"
-Import-Package: org.eclipse.nebula.widgets.nattable.config;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.export;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.layer;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.layer.cell;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[1.2.0,1.3.0)",
- org.eclipse.nebula.widgets.nattable.style;version="[1.2.0,1.3.0)",
+Import-Package: org.eclipse.nebula.widgets.nattable.config;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.export;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.layer;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.layer.cell;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.painter.cell.decorator;version="[2.0.0,2.1.0)",
+ org.eclipse.nebula.widgets.nattable.style;version="[2.0.0,2.1.0)",
  org.eclipse.swt,
  org.eclipse.swt.graphics,
  org.eclipse.swt.widgets