diff --git a/wax-prosemirror-core/index.js b/wax-prosemirror-core/index.js
index 292f57b0c09251afcd88de6d3294d19eb64fa043..6350d583b9c7995177ee39fe5bb8b64d6c63d831 100644
--- a/wax-prosemirror-core/index.js
+++ b/wax-prosemirror-core/index.js
@@ -1,3 +1,6 @@
+/* Editor */
+export { default as Wax } from './src/Wax';
+
 /* Cotext & ComponentPlugin */
 export { WaxContext, useInjection } from './src/WaxContext';
 export { PortalContext } from './src/PortalContext';
@@ -25,6 +28,3 @@ export { default as RulesService } from './src/config/defaultServices/RulesServi
 export { default as SchemaService } from './src/config/defaultServices/SchemaService/SchemaService';
 export { default as ShortCutsService } from './src/config/defaultServices/ShortCutsService/ShortCutsService';
 export { default as QuestionsNodeView } from './src/utilities/lib/helpers/QuestionsNodeView';
-
-/* Editor */
-export { default as Wax } from './src/Wax';
diff --git a/wax-prosemirror-core/src/Application.js b/wax-prosemirror-core/src/Application.js
index ef7f4f8a3a5ca5e6dffe6111ff04026cfe808090..33d89fade7127e2d947b0524e4f32bfbc06b0997 100644
--- a/wax-prosemirror-core/src/Application.js
+++ b/wax-prosemirror-core/src/Application.js
@@ -1,5 +1,5 @@
 import { Container } from 'inversify';
-// import 'reflect-metadata';
+import 'reflect-metadata';
 import deepmerge from 'deepmerge';
 import Config from './config/Config';
 import defaultConfig from './config/defaultConfig';
diff --git a/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js b/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
index 7d6affbbe980db9b671a9fb12423da057a0e3306..7065dfc3b1bf2fe7eda9fd02db3341a2f769d628 100644
--- a/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/LayoutService/LayoutService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import Layout from './Layout';
 
 export default class LayoutService extends Service {
diff --git a/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
index 48f93faa4576d93dcdee9a40d37d01bf1b626cf2..aa0c4ac7363bd7c0818d9e8f4a628bdcadd341b6 100644
--- a/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/MenuService/MenuService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import { isPlainObject, isFunction } from 'lodash';
 import Menu from './Menu';
 import MenuCollection from './MenuCollection';
diff --git a/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
index 02596a84804c993e9017529aed4d24a2ab4b8503..b7e641a03dc144cbfd005783c4acfbd816120f28 100644
--- a/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/OverlayService/OverlayService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import OverlayComponent from './OverlayComponent';
 
 export default class OverlayService extends Service {
diff --git a/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js b/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
index e48c30a76294afd308dbd5031e5b6ed3df9de83f..ec3656830a3a1a8486a6351a3dcaa93699db1475 100644
--- a/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/PortalService/PortalService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import PortalComponent from './components/PortalComponent';
 import PortalPlugin from './portalPlugin';
 import Portals from './Portals';
diff --git a/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js b/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
index 8cb6cfb4006011428a18a9e88ccb9b8214a07f1d..bd0e17260191a6b81044ca8695b83d170d745168 100644
--- a/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/RulesService/RulesService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import Rules from './Rules';
 
 export default class RulesService extends Service {
diff --git a/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js b/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
index 2a82bc0eee115101cea78cd3e5b629ec35c02e31..0f2308d08278d266efacbf2dc924cfee5115d39e 100644
--- a/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/SchemaService/SchemaService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import { each } from 'lodash';
 import Schema from './Schema';
 // import Node from './Node';
diff --git a/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
index fc16808b6b3c59338144d0089996f8590caf0f2f..b5c3dcc4943107b04e48b6637613a5078305ba4d 100644
--- a/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
+++ b/wax-prosemirror-core/src/config/defaultServices/ShortCutsService/ShortCutsService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-core';
+import Service from '../../../Service';
 import ShortCuts from './ShortCuts';
 
 export default class ShortCutsService extends Service {