diff --git a/wax-prosemirror-core/Wax.js b/wax-prosemirror-core/Wax.js
index b6e6d9a43f28a7407358a5f482978d3d3a8b8040..9155d6483ec23097572a6c1d6541b5c5251bcd90 100644
--- a/wax-prosemirror-core/Wax.js
+++ b/wax-prosemirror-core/Wax.js
@@ -7,8 +7,6 @@ import Editor from "./Editor";
 import plugins from "./config/plugins";
 import placeholder from "./config/plugins/placeholder";
 
-import MainMenuBar from "./components/menu/MainMenuBar";
-import defaultMenuItems from "./config/DefaultMenuItems";
 import WaxKeys from "./config/classes/WaxKeys";
 
 const parser = schema => {
@@ -46,12 +44,10 @@ class Wax extends Component {
     // TO DO Find a way to start plugins with options
     plugins.push(...[placeholder({ content: this.props.placeholder }), keys]);
 
-    this.WaxOptions = options
-      ? options
-      : {
-          plugins,
-          schema
-        };
+    this.WaxOptions = {
+      schema,
+      plugins
+    };
 
     const parse = parser(schema);
     const serialize = serializer(schema);
diff --git a/wax-prosemirror-core/config/classes/WaxKeys.js b/wax-prosemirror-core/config/classes/WaxKeys.js
index ceef5f58bee29bbe4ccfbc0f80cb110b6a187c70..bc4c34e893c7a834f46cae09fadff099084883dd 100644
--- a/wax-prosemirror-core/config/classes/WaxKeys.js
+++ b/wax-prosemirror-core/config/classes/WaxKeys.js
@@ -7,7 +7,7 @@ import {
   liftListItem,
   sinkListItem
 } from "prosemirror-schema-list";
-// import { goToNextCell } from "prosemirror-tables";
+
 import {
   baseKeymap,
   toggleMark,
@@ -21,8 +21,6 @@ import {
   selectParentNode
 } from "prosemirror-commands";
 
-import { goToNextCell } from "prosemirror-tables";
-
 class WaxKeys {
   constructor(config) {
     this.schema = config.schema;
@@ -88,9 +86,7 @@ class WaxKeys {
       "Shift-Ctrl-4": setBlockType(this.schema.nodes.heading, { level: 4 }),
       "Shift-Ctrl-5": setBlockType(this.schema.nodes.heading, { level: 5 }),
       "Shift-Ctrl-6": setBlockType(this.schema.nodes.heading, { level: 6 }),
-      "Mod-_": this.insertRule,
-      Tab: goToNextCell(1),
-      "Shift-Tab": goToNextCell(-1)
+      "Mod-_": this.insertRule
     };
   }
 
diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 35d79a14c007fc1fee924ef5bdafcf50164046f7..ad583d713d69e03729bfdad1931e3416f82aa639 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -1,6 +1,6 @@
 export { default as Wax } from "./Wax";
-
 export { default as createSchema } from "./config/classes/createSchema";
+
 export { default as plugins } from "./config/plugins";
 
 //Components
diff --git a/wax-prosemirror-schema/defaultSchema.js b/wax-prosemirror-schema/defaultSchema.js
index 5ce06618e548deb20f30d74e58e319cf001ff7b5..0933aa5f238af3bf3201026f2016ab806441147c 100644
--- a/wax-prosemirror-schema/defaultSchema.js
+++ b/wax-prosemirror-schema/defaultSchema.js
@@ -1,13 +1,25 @@
-const pDOM = ["p", 0];
+const pDOM = ["p", 0],
+  brDOM = ["br"];
 const defaultSchema = {
   nodes: {
     doc: {
       content: "block+"
     },
+
     text: {
       group: "inline"
     },
 
+    hard_break: {
+      inline: true,
+      group: "inline",
+      selectable: false,
+      parseDOM: [{ tag: "br" }],
+      toDOM() {
+        return brDOM;
+      }
+    },
+
     paragraph: {
       content: "inline*",
       group: "block",