diff --git a/src/block_manager/index.js b/src/block_manager/index.js
index 85ee4ca16..ed223236d 100644
--- a/src/block_manager/index.js
+++ b/src/block_manager/index.js
@@ -48,6 +48,16 @@ import Blocks from './model/Blocks';
 import BlockCategories from './model/Categories';
 import BlocksView from './view/BlocksView';
 
+export const evAll = 'block';
+export const evPfx = `${evAll}:`;
+export const evUpdate = `${evPfx}update`;
+export const evAdd = `${evPfx}add`;
+export const evRemove = `${evPfx}remove`;
+export const evRemoveBefore = `${evRemove}:before`;
+// export const evCustom = `${evPfx}custom`;
+// export const evOpen = `${evPfx}open`;
+// export const evClose = `${evPfx}close`;
+
 export default () => {
   var c = {};
   var blocks, blocksVisible, blocksView;
@@ -56,49 +66,35 @@ export default () => {
   return {
     ...Module,
 
-    /**
-     * Name of the module
-     * @type {String}
-     * @private
-     */
     name: 'BlockManager',
 
-    /**
-     * Initialize module. Automatically called with a new instance of the editor
-     * @param {Object} config Configurations
-     * @return {this}
-     * @private
-     */
-    init(config) {
-      c = config || {};
-      const em = c.em;
-      this.em = em;
+    events: {
+      all: evAll,
+      update: evUpdate,
+      add: evAdd,
+      remove: evRemove,
+      removeBefore: evRemoveBefore
+      // custom: evCustom,
+      // open: evOpen,
+      // close: evClose
+    },
 
-      for (let name in defaults) {
-        if (!(name in c)) {
-          c[name] = defaults[name];
-        }
-      }
+    init(config = {}) {
+      c = { ...defaults, ...config };
+      const { em } = c;
+      this.em = em;
 
       // Global blocks collection
       blocks = new Blocks([]);
       blocksVisible = new Blocks([]);
       categories = new BlockCategories();
+      this.all = blocks;
+      this.__initListen();
 
       // Setup the sync between the global and public collections
-      blocks.listenTo(blocks, 'add', model => {
-        blocksVisible.add(model);
-        em && em.trigger('block:add', model);
-      });
-
-      blocks.listenTo(blocks, 'remove', model => {
-        blocksVisible.remove(model);
-        em && em.trigger('block:remove', model);
-      });
-
-      blocks.listenTo(blocks, 'reset', coll => {
-        blocksVisible.reset(coll.models);
-      });
+      blocks.on('add', model => blocksVisible.add(model));
+      blocks.on('remove', model => blocksVisible.remove(model));
+      blocks.on('reset', coll => blocksVisible.reset(coll.models));
 
       return this;
     },
@@ -178,8 +174,8 @@ export default () => {
     },
 
     /**
-     * Return all blocks
-     * @return {Collection}
+     * Return all blocks.
+     * @return {Collection<[Block]>}
      * @example
      * const blocks = blockManager.getAll();
      * console.log(JSON.stringify(blocks));
@@ -198,16 +194,17 @@ export default () => {
     },
 
     /**
-     * Remove a block by id
-     * @param {string} id Block id
+     * Remove block.
+     * @param {String|[Block]} block Block or block ID
      * @returns {[Block]} Removed block
      * @example
-     * // Id of the block which need to be removed
-     * const id = 'button';
-     * blockManager.remove(id);
+     * const removed = blockManager.remove('BLOCK_ID');
+     * // or by passing the Block
+     * const block = blockManager.get('BLOCK_ID');
+     * blockManager.remove(block);
      */
-    remove(id) {
-      return blocks.remove(id);
+    remove(id, opts) {
+      return this.__remove(id, opts);
     },
 
     /**
@@ -280,12 +277,10 @@ export default () => {
     },
 
     destroy() {
-      blocks.reset();
-      blocks.stopListening();
-      blocksVisible.reset();
-      categories.reset();
+      const colls = [blocks, blocksVisible, categories];
+      colls.map(c => c.stopListening());
+      colls.map(c => c.reset());
       blocksView && blocksView.remove();
-      [blocks, blocksVisible, categories, blocksView].forEach(i => (i = null));
       c = {};
     }
   };
diff --git a/test/specs/block_manager/index.js b/test/specs/block_manager/index.js
index 3e76631ed..0516081d7 100644
--- a/test/specs/block_manager/index.js
+++ b/test/specs/block_manager/index.js
@@ -1,24 +1,34 @@
-import BlockManager from 'block_manager';
-import BlocksView from './view/BlocksView';
+import Editor from 'editor';
 
 describe('BlockManager', () => {
   describe('Main', () => {
-    var obj;
-    var idTest;
-    var optsTest;
+    let obj;
+    let idTest;
+    let optsTest;
+    let editor;
 
     beforeEach(() => {
+      editor = new Editor({
+        blockManager: {
+          blocks: []
+        }
+      }).init();
+
       idTest = 'h1-block';
       optsTest = {
         label: 'Heading',
         content: '<h1>Test</h1>'
       };
-      obj = new BlockManager().init();
-      obj.postRender();
-      obj.render();
+
+      obj = editor.Blocks;
+
+      // obj = new BlockManager().init();
+      // obj.postRender();
+      // obj.render();
     });
 
     afterEach(() => {
+      editor.destroy();
       obj = null;
     });
 
@@ -35,7 +45,7 @@ describe('BlockManager', () => {
     });
 
     test('Add new block', () => {
-      var model = obj.add(idTest, optsTest);
+      obj.add(idTest, optsTest);
       expect(obj.getAll().length).toEqual(1);
     });
 
@@ -63,9 +73,38 @@ describe('BlockManager', () => {
       expect(model).toEqual(model2);
     });
 
-    test('Render blocks', () => {
+    test.skip('Render blocks', () => {
       obj.render();
       expect(obj.getContainer()).toBeTruthy();
     });
+
+    describe.only('Events', () => {
+      test('Add triggers proper events', () => {
+        const eventAdd = jest.fn();
+        const eventAll = jest.fn();
+        editor.on(obj.events.add, eventAdd);
+        editor.on(obj.events.all, eventAll);
+        const added = obj.add(idTest, optsTest);
+        expect(eventAdd).toBeCalledTimes(1);
+        expect(eventAdd).toBeCalledWith(added, expect.anything());
+        expect(eventAll).toBeCalled();
+      });
+
+      test('Remove triggers proper events', () => {
+        const eventBfRm = jest.fn();
+        const eventRm = jest.fn();
+        const eventAll = jest.fn();
+        editor.on(obj.events.removeBefore, eventBfRm);
+        editor.on(obj.events.remove, eventRm);
+        editor.on(obj.events.all, eventAll);
+        obj.add(idTest, optsTest);
+        const removed = obj.remove(idTest);
+        expect(obj.getAll().length).toBe(0);
+        expect(eventBfRm).toBeCalledTimes(1);
+        expect(eventRm).toBeCalledTimes(1);
+        expect(eventRm).toBeCalledWith(removed, expect.anything());
+        expect(eventAll).toBeCalled();
+      });
+    });
   });
 });