diff --git a/modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/tables/AbstractElementsDataTable.java b/modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/tables/AbstractElementsDataTable.java
index beea6a496234a9d96ac4628feb005aecaa4ad360..aaa5ba7bae23fd89dd79c044057a2f3ae8f0f3d2 100644
--- a/modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/tables/AbstractElementsDataTable.java
+++ b/modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/tables/AbstractElementsDataTable.java
@@ -56,8 +56,6 @@ import org.gephi.datalab.api.AttributeColumnsController;
 import org.gephi.graph.api.Element;
 import org.jdesktop.swingx.JXTable;
 import org.jdesktop.swingx.decorator.HighlighterFactory;
-import org.jdesktop.swingx.table.TableColumnExt;
-import org.jdesktop.swingx.table.TableColumnModelExt;
 import org.openide.util.Lookup;
 
 /**
diff --git a/modules/ToolsPlugin/pom.xml b/modules/ToolsPlugin/pom.xml
index f0df219efabf5e8c3a719dccfa48a3d97cd37536..236eb7752b52edcc2881eb5e61060629ec846882 100644
--- a/modules/ToolsPlugin/pom.xml
+++ b/modules/ToolsPlugin/pom.xml
@@ -36,10 +36,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>tools-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>utils-collection</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>visualization</artifactId>
diff --git a/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditEdges.java b/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditEdges.java
index 87783200c10d29cb7e441c123a6ddfeba6e6557a..299e01a60d79637301eb709dcabffdcbbb66aeb3 100644
--- a/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditEdges.java
+++ b/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditEdges.java
@@ -125,9 +125,7 @@ public class EditEdges extends AbstractNode {
 
             Edge row =edges[0];
             AttributeValueWrapper wrap;
-            for (String key : row.getAttributeKeys()) {
-                Column column = null;//TODO somehow get this from graphstore API
-                
+            for (Column column : row.getAttributeColumns()) {
                 if (multipleEdges) {
                     wrap = new MultipleRowsAttributeValueWrapper(edges, column,currentTimeFormat);
                 } else {
diff --git a/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditNodes.java b/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditNodes.java
index db89c6e62f57182f7580dc17928ad9c9dec6f9da..47c24d33d0e9d4fa6f88b700a95a144b6dfd7ec2 100644
--- a/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditNodes.java
+++ b/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditNodes.java
@@ -125,9 +125,7 @@ public class EditNodes extends AbstractNode {
 
             Node row =  nodes[0];
             AttributeValueWrapper wrap;
-            for (String key : row.getAttributeKeys()) {
-                Column column = null;//TODO somehow get this from graphstore API
-                
+            for (Column column : row.getAttributeColumns()) {
                 if (multipleNodes) {
                     wrap = new MultipleRowsAttributeValueWrapper(nodes, column,currentTimeFormat);
                 } else {
diff --git a/modules/application/pom.xml b/modules/application/pom.xml
index eeeb02a9499ba7bb42c7d509275a8d5b7e45ce34..052e88af5273f82fc03146507aba6ad51a6c05e1 100644
--- a/modules/application/pom.xml
+++ b/modules/application/pom.xml
@@ -258,10 +258,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>visualization</artifactId>
         </dependency>
-        <!--        <dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>tools-plugin</artifactId>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>welcome-screen</artifactId>
diff --git a/pom.xml b/pom.xml
index ce785d58bdfc6963a5ab72922eff195fa46b6e5b..1733f572230b395c0d5eebb77d5497b018b26b16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1175,6 +1175,7 @@
         <module>modules/StatisticsPlugin</module>
         <module>modules/StatisticsPluginUI</module>
         <module>modules/ToolsAPI</module>
+		<module>modules/ToolsPlugin</module>
         <module>modules/UIComponents</module>
         <module>modules/UIUtils</module>
         <module>modules/Utils</module>