diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index 18946d5bf729ee35fee9f975b0199220aec0154a..cf386e1c9f5d29ac74424d372e082c02e3cb032b 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -13,6 +13,7 @@ export default {
       toolGroups: [
         "Annotations",
         "Lists",
+        "Tables",
         { name: "RedoUndo", exclude: ["Redo"] }
       ]
     },
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index 55d21c2340ad1d6adb2208669a666e6e429e57f2..b37c05636ae79195bce3d7a3452a8148f214d61f 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -12,7 +12,9 @@ import {
   InlineAnnotationsService,
   LinkService,
   ListsService,
-  ListToolGroupService
+  ListToolGroupService,
+  TablesService,
+  TableToolGroupService
 } from "wax-prosemirror-services";
 
 export default {
@@ -30,6 +32,8 @@ export default {
     new ImageService(),
     new InlineAnnotationsService(),
     new LinkService(),
-    new ListsService()
+    new ListsService(),
+    new TableToolGroupService(),
+    new TablesService()
   ]
 };
diff --git a/wax-prosemirror-schema/src/editoria/nodes.js b/wax-prosemirror-schema/src/editoria/nodes.js
index 5e90ad55da62bfca83af500bf608977922964b21..8caedf3c1383d419db69f78d35dd9c558e732b8f 100644
--- a/wax-prosemirror-schema/src/editoria/nodes.js
+++ b/wax-prosemirror-schema/src/editoria/nodes.js
@@ -1,4 +1,4 @@
-import { tableNodes, columnResizing, tableEditing } from "prosemirror-tables";
+import { tableNodes } from "prosemirror-tables";
 import { parseFormatList, parseTracks, blockLevelToDOM } from "./helpers";
 const pDOM = ["p", 0],
   brDOM = ["br"],
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index e884c5d7ce9923dafb21b0bad173dc73102e8379..59fda382873797ddaa7e763fea7029e99be641c9 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -1,5 +1,6 @@
-export { default as LinkService } from "./src/LinkService/LinkService";
 export { default as MenuService } from "./src/MenuService/MenuService";
+export { default as LinkService } from "./src/LinkService/LinkService";
+
 export {
   default as RedoUndoService
 } from "./src/RedoUndoService/RedoUndoService";
@@ -16,12 +17,17 @@ export { default as SchemaService } from "./src/SchemaService/SchemaService";
 export {
   default as ShortCutsService
 } from "./src/ShortCutsService/ShortCutsService";
+
+export { default as Tool } from "./src/lib/Tools";
+
+/*
+All Elements services
+*/
 export {
   default as InlineAnnotationsService
 } from "./src/InlineAnnotations/InlineAnnotationsService";
 export { default as ListsService } from "./src/ListsService/ListsService";
-
-export { default as Tool } from "./src/lib/Tools";
+export { default as TablesService } from "./src/TablesService/TablesService";
 
 /*
 ToolGroups
@@ -32,3 +38,6 @@ export {
 export {
   default as ListToolGroupService
 } from "./src/WaxToolGroups/ListToolGroupService/ListToolGroupService";
+export {
+  default as TableToolGroupService
+} from "./src/WaxToolGroups/TableToolGroupService/TableToolGroupService";
diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
index 12ed7228e6d81da832f0b4c0141c757736e1f670..969a3bad14c9259f514b3344d5575f76b413b7de 100644
--- a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
+++ b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js
@@ -1,5 +1,5 @@
 import Service from "wax-prosemirror-core/src/services/Service";
-import Table from "./Table";
+import TableDropDownOptions from "./TableDropDownOptions";
 
 class EditTableService extends Service {
   boot() {}
diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
index 2bd55d9c6a71ff0c9a2968ececffaaa93953bb99..9deea97f43b9a336be4fb505ba64a18f95e33e8a 100644
--- a/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
+++ b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { v4 as uuid } from "uuid";
-import { canInsert } from "../../../lib/Utils";
-import Tools from "../../../lib/Tools";
+import { canInsert } from "../../lib/Utils";
+import Tools from "../../lib/Tools";
 import { injectable } from "inversify";
 import { TableDropDown } from "wax-prosemirror-components";
 import { addColumnBefore } from "prosemirror-tables";
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
index 1644a00da4584a5302ebd927ada0340c302d7935..f0accdee4507b4d4b1fa4bde25ee3b9c315b3dd8 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/InsertTableService.js
@@ -1,3 +1,4 @@
+import { tableNodes } from "prosemirror-tables";
 import Service from "wax-prosemirror-core/src/services/Service";
 import Table from "./Table";
 
diff --git a/wax-prosemirror-services/src/TablesService/index.js b/wax-prosemirror-services/src/TablesService/index.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9565d0fbe0c9bab890a60a17c49de8ab53f42ca4 100644
--- a/wax-prosemirror-services/src/TablesService/index.js
+++ b/wax-prosemirror-services/src/TablesService/index.js
@@ -0,0 +1,4 @@
+import InsertTableService from "./InsertTableService/InsertTableService";
+import EditTableService from "./EditTableService/EditTableService";
+
+export default [new InsertTableService(), new EditTableService()];
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableGroupService.js
deleted file mode 100644
index 137ed227b0b53ecd863d52f28e2f5574c4be44c9..0000000000000000000000000000000000000000
--- a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableGroupService.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Table from "./Table";
-import Service from "wax-prosemirror-core/src/services/Service";
-
-class TableToolGroupService extends Service {
-  name = "TableToolGroupService";
-
-  register() {
-    this.container.bind("Table").to(Table);
-  }
-}
-
-export default TableToolGroupService;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
index 137ed227b0b53ecd863d52f28e2f5574c4be44c9..10c19d7df52183acb6f200021d6b7e65c5199eb7 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/TableToolGroupService.js
@@ -1,11 +1,11 @@
-import Table from "./Table";
+import Tables from "./Tables";
 import Service from "wax-prosemirror-core/src/services/Service";
 
 class TableToolGroupService extends Service {
   name = "TableToolGroupService";
 
   register() {
-    this.container.bind("Table").to(Table);
+    this.container.bind("Tables").to(Tables);
   }
 }
 
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Table.js b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Tables.js
similarity index 56%
rename from wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Table.js
rename to wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Tables.js
index 92a7740763387faa1ccde82050d875cadcf260e1..eff5bb286104f40cb9da9a5388df32d48cce1d54 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Table.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/TableToolGroupService/Tables.js
@@ -2,16 +2,14 @@ import { injectable, inject } from "inversify";
 import ToolGroup from "../../lib/ToolGroup";
 
 @injectable()
-class Table extends ToolGroup {
+class Tables extends ToolGroup {
   tools = [];
   constructor(
-    @inject("OrderedList") orderedlist,
-    @inject("BulletList") bulletlist,
-    @inject("JoinUp") joinup,
-    @inject("Lift") lift
+    @inject("Table") table,
+    @inject("TableDropDownOptions") tableDropDownOptions
   ) {
     super();
-    this.tools = [orderedlist, bulletlist, joinup, lift];
+    this.tools = [table, tableDropDownOptions];
   }
 
   renderTools(view) {
@@ -23,4 +21,4 @@ class Table extends ToolGroup {
   }
 }
 
-export default Table;
+export default Tables;