diff --git a/src/code_manager/index.ts b/src/code_manager/index.ts
index 085ebee23..93b0b6525 100644
--- a/src/code_manager/index.ts
+++ b/src/code_manager/index.ts
@@ -175,7 +175,7 @@ export default class CodeManagerModule extends Module<CodeManagerConfig & { pSty
    * @example
    * var codeStr = codeManager.getCode(model, 'html');
    * */
-  getCode(model: any, genId: string, opt: any = {}) {
+  getCode(model: any, genId: string, opt: any = {}): string {
     opt.em = this.em;
     const generator = this.getGenerator(genId);
     return generator ? generator.build(model, opt) : '';
diff --git a/src/editor/index.ts b/src/editor/index.ts
index cc75b3082..6a5b15dcb 100644
--- a/src/editor/index.ts
+++ b/src/editor/index.ts
@@ -61,7 +61,7 @@ import { CustomParserCss } from '../parser/config/config';
 import cash from '../utils/cash-dom';
 import html from '../utils/html';
 import defaults, { EditorConfig, EditorConfigKeys } from './config/config';
-import EditorModel from './model/Editor';
+import EditorModel, { ProjectData } from './model/Editor';
 import EditorView from './view/EditorView';
 
 export type ParsedRule = {
@@ -73,6 +73,8 @@ export type ParsedRule = {
 
 type EditorConfigType = EditorConfig & { pStylePrefix?: string };
 
+type EditorModelParam<T extends keyof EditorModel, N extends number> = Parameters<EditorModel[T]>[N];
+
 export default class EditorModule implements IBaseModule<EditorConfig> {
   editorView?: EditorView;
   editor: EditorModel;
@@ -194,6 +196,10 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
     return this.em.Devices;
   }
 
+  get EditorModel() {
+    return this.em;
+  }
+
   /**
    * Returns configuration object
    * @returns {any} Returns the configuration object or the value of the specified property
@@ -212,7 +218,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @param {Boolean} [opts.cleanId=false] Remove unnecessary IDs (eg. those created automatically)
    * @returns {string} HTML string
    */
-  getHtml(opts?: any) {
+  getHtml(opts?: { component?: Component; cleanId?: boolean }) {
     return this.em.getHtml(opts);
   }
 
@@ -226,7 +232,13 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @param {Boolean} [opts.keepUnusedStyles=false] Force keep all defined rules. Toggle on in case output looks different inside/outside of the editor.
    * @returns {String|Array<CssRule>} CSS string or array of CssRules
    */
-  getCss(opts?: any) {
+  getCss(opts?: {
+    component?: Component;
+    json?: boolean;
+    avoidProtected?: boolean;
+    onlyMatched?: boolean;
+    keepUnusedStyles?: boolean;
+  }) {
     return this.em.getCss(opts);
   }
 
@@ -236,7 +248,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @param {Component} [opts.component] Get the JS of a specific component
    * @returns {String} JS string
    */
-  getJs(opts: any) {
+  getJs(opts?: { component?: Component }) {
     return this.em.getJs(opts);
   }
 
@@ -245,7 +257,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @return {Components}
    */
   getComponents() {
-    return this.em.get('DomComponents').getComponents();
+    return this.Components.getComponents();
   }
 
   /**
@@ -253,7 +265,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @return {Component}
    */
   getWrapper() {
-    return this.em.get('DomComponents').getWrapper();
+    return this.Components.getWrapper();
   }
 
   /**
@@ -270,7 +282,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    *   content: 'New component'
    * });
    */
-  setComponents(components: any, opt = {}) {
+  setComponents(components: any, opt: any = {}) {
     this.em.setComponents(components, opt);
     return this;
   }
@@ -292,7 +304,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    *   content: 'New component'
    * });
    */
-  addComponents(components: any, opts: any) {
+  addComponents(components: any, opts?: any): Component[] {
     return this.getWrapper().append(components, opts);
   }
 
@@ -301,7 +313,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @return {Object}
    */
   getStyle() {
-    return this.em.get('CssComposer').getAll();
+    return this.em.Css.getAll();
   }
 
   /**
@@ -316,7 +328,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    *   style: { color: 'red' }
    * });
    */
-  setStyle(style: any, opt = {}) {
+  setStyle(style: any, opt: any = {}) {
     this.em.setStyle(style, opt);
     return this;
   }
@@ -376,7 +388,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    *  editor.select(model);
    * });
    */
-  select(el?: Component | Component[], opts?: any) {
+  select(el?: EditorModelParam<'setSelected', 0>, opts?: { scroll?: boolean }) {
     this.em.setSelected(el, opts);
     return this;
   }
@@ -388,7 +400,8 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @example
    * editor.selectAdd(model);
    */
-  selectAdd(el: any) {
+  // selectAdd(el: Parameters<EditorModel['addSelected']>[0]) {
+  selectAdd(el: EditorModelParam<'addSelected', 0>) {
     this.em.addSelected(el);
     return this;
   }
@@ -400,7 +413,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @example
    * editor.selectRemove(model);
    */
-  selectRemove(el: any) {
+  selectRemove(el: EditorModelParam<'removeSelected', 0>) {
     this.em.removeSelected(el);
     return this;
   }
@@ -412,7 +425,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @example
    * editor.selectToggle(model);
    */
-  selectToggle(el: any) {
+  selectToggle(el: EditorModelParam<'toggleSelected', 0>) {
     this.em.toggleSelected(el);
     return this;
   }
@@ -451,7 +464,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * console.log(device);
    * // 'Tablet'
    */
-  getDevice() {
+  getDevice(): string {
     return this.em.get('device');
   }
 
@@ -464,7 +477,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * editor.runCommand('myCommand', {someValue: 1});
    */
   runCommand(id: string, options: Record<string, unknown> = {}) {
-    return this.em.get('Commands').run(id, options);
+    return this.Commands.run(id, options);
   }
 
   /**
@@ -476,7 +489,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * editor.stopCommand('myCommand', {someValue: 1});
    */
   stopCommand(id: string, options: Record<string, unknown> = {}) {
-    return this.em.get('Commands').stop(id, options);
+    return this.Commands.stop(id, options);
   }
 
   /**
@@ -519,7 +532,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @example
    * editor.loadProjectData({ pages: [...], styles: [...], ... })
    */
-  loadProjectData(data: any) {
+  loadProjectData(data: ProjectData) {
     return this.em.loadData(data);
   }
 
@@ -565,7 +578,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * @param {Object} [options] Options
    * @param {Boolean} [options.tools=false] Update the position of tools (eg. rich text editor, component highlighter, etc.)
    */
-  refresh(opts?: any) {
+  refresh(opts?: { tools?: boolean }) {
     this.em.refreshCanvas(opts);
   }
 
@@ -652,7 +665,7 @@ export default class EditorModule implements IBaseModule<EditorConfig> {
    * // options, as arguments, eg:
    * // editor.on('log:info', (msg, opts) => console.info(msg, opts))
    */
-  log(msg: string, opts = {}) {
+  log(msg: string, opts: { ns?: string; level?: string } = {}) {
     this.em.log(msg, opts);
     return this;
   }
diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts
index 86895ca6f..343cd77c2 100644
--- a/src/editor/model/Editor.ts
+++ b/src/editor/model/Editor.ts
@@ -33,6 +33,11 @@ import UndoManagerModule from '../../undo_manager';
 import RichTextEditorModule from '../../rich_text_editor';
 import CommandsModule from '../../commands';
 import StyleManager from '../../style_manager';
+import CssRule from '../../css_composer/model/CssRule';
+
+export interface ProjectData {
+  [key: string]: any;
+}
 
 //@ts-ignore
 Backbone.$ = $;
@@ -588,7 +593,7 @@ export default class EditorModel extends Model {
    * @param  {Object} [opts={}] Options, optional
    * @public
    */
-  addSelected(el: Component, opts: any = {}) {
+  addSelected(el: Component | Component[], opts: any = {}) {
     const model = getModel(el, $);
     const models = isArray(model) ? model : [model];
 
@@ -618,7 +623,7 @@ export default class EditorModel extends Model {
    * @param  {Object} [opts={}] Options, optional
    * @public
    */
-  removeSelected(el: any, opts = {}) {
+  removeSelected(el: Component | Component[], opts = {}) {
     this.selected.removeComponent(getModel(el, $), opts);
   }
 
@@ -628,7 +633,7 @@ export default class EditorModel extends Model {
    * @param  {Object} [opts={}] Options, optional
    * @public
    */
-  toggleSelected(el: any, opts = {}) {
+  toggleSelected(el: Component | Component[], opts: any = {}) {
     const model = getModel(el, $);
     const models = isArray(model) ? model : [model];
 
@@ -725,7 +730,7 @@ export default class EditorModel extends Model {
    * @returns {Array<CssRule>}
    * @public
    */
-  addStyle(style: any, opts = {}) {
+  addStyle(style: any, opts = {}): CssRule[] {
     const res = this.getStyle().add(style, opts);
     return isArray(res) ? res : [res];
   }
@@ -736,7 +741,7 @@ export default class EditorModel extends Model {
    * @private
    */
   getStyle() {
-    return this.get('CssComposer').getAll();
+    return this.Css.getAll();
   }
 
   /**
@@ -763,7 +768,7 @@ export default class EditorModel extends Model {
    * @returns {string} HTML string
    * @public
    */
-  getHtml(opts: any = {}) {
+  getHtml(opts: { component?: Component; cleanId?: boolean } = {}): string {
     const { config } = this;
     const { optsHtml } = config;
     const js = config.jsInHtml ? this.getJs(opts) : '';
@@ -784,17 +789,25 @@ export default class EditorModel extends Model {
    * @returns {string} CSS string
    * @public
    */
-  getCss(opts: any = {}) {
-    const config = this.config;
+  getCss(
+    opts: {
+      component?: Component;
+      json?: boolean;
+      avoidProtected?: boolean;
+      onlyMatched?: boolean;
+      keepUnusedStyles?: boolean;
+    } = {}
+  ) {
+    const { config } = this;
     const { optsCss } = config;
     const avoidProt = opts.avoidProtected;
     const keepUnusedStyles = !isUndefined(opts.keepUnusedStyles) ? opts.keepUnusedStyles : config.keepUnusedStyles;
     const cssc = this.get('CssComposer');
-    const wrp = opts.component || this.get('DomComponents').getComponent();
+    const wrp = opts.component || this.Components.getComponent();
     const protCss = !avoidProt ? config.protectedCss : '';
     const css =
       wrp &&
-      this.get('CodeManager').getCode(wrp, 'css', {
+      this.CodeManager.getCode(wrp, 'css', {
         cssc,
         keepUnusedStyles,
         ...optsCss,
@@ -808,9 +821,9 @@ export default class EditorModel extends Model {
    * @return {string} JS string
    * @public
    */
-  getJs(opts: any = {}) {
-    var wrp = opts.component || this.get('DomComponents').getWrapper();
-    return wrp ? this.get('CodeManager').getCode(wrp, 'js').trim() : '';
+  getJs(opts: { component?: Component } = {}) {
+    var wrp = opts.component || this.Components.getWrapper();
+    return wrp ? this.CodeManager.getCode(wrp, 'js').trim() : '';
   }
 
   /**
@@ -819,7 +832,7 @@ export default class EditorModel extends Model {
    */
   async store(options?: any) {
     const data = this.storeData();
-    await this.get('StorageManager').store(data, options);
+    await this.Storage.store(data, options);
     this.clearDirtyCount();
     return data;
   }
@@ -829,12 +842,12 @@ export default class EditorModel extends Model {
    * @public
    */
   async load(options?: any) {
-    const result = await this.get('StorageManager').load(options);
+    const result = await this.Storage.load(options);
     this.loadData(result);
     return result;
   }
 
-  storeData() {
+  storeData(): ProjectData {
     let result = {};
     // Sync content if there is an active RTE
     const editingCmp = this.getEditing();
@@ -846,7 +859,7 @@ export default class EditorModel extends Model {
     return JSON.parse(JSON.stringify(result));
   }
 
-  loadData(data = {}) {
+  loadData(data: ProjectData = {}): ProjectData {
     if (!isEmptyObj(data)) {
       this.storables.forEach(module => module.clear());
       this.storables.forEach(module => module.load(data));
@@ -1015,9 +1028,9 @@ export default class EditorModel extends Model {
     hasWin() && $(config.el).empty().attr(this.attrsOrig);
   }
 
-  getEditing() {
+  getEditing(): Component | undefined {
     const res = this.get('editing');
-    return (res && res.model) || null;
+    return (res && res.model) || undefined;
   }
 
   setEditing(value: boolean) {
diff --git a/src/editor/model/Selected.ts b/src/editor/model/Selected.ts
index 067f90a52..7e568750e 100644
--- a/src/editor/model/Selected.ts
+++ b/src/editor/model/Selected.ts
@@ -27,7 +27,7 @@ export default class Selected extends Collection<Selectable> {
 
   lastComponent() {
     const last = this.last();
-    return last && this.getComponent(last);
+    return last ? this.getComponent(last) : undefined;
   }
 
   allComponents() {