diff --git a/.eslintrc.json b/.eslintrc.json
index 435ebed3d..d999020ad 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -126,6 +126,6 @@
     "@typescript-eslint/semi": ["error", "always"],
     "@typescript-eslint/type-annotation-spacing": "error",
     "@typescript-eslint/unified-signatures": "error",
-    "@typescript-eslint/no-explicit-any": "off"
+    "@typescript-eslint/no-explicit-any": "warn"
   }
 }
diff --git a/packages/qgrid-core/public-api.d.ts b/packages/qgrid-core/public-api.d.ts
index 748d44c91..657b9db96 100644
--- a/packages/qgrid-core/public-api.d.ts
+++ b/packages/qgrid-core/public-api.d.ts
@@ -381,7 +381,7 @@ export { Resource } from './src/resource/resource';
 // export { EnumerableResource } from './src/resource/resource.enumerable';
 // export { factory } from './src/resource/resource.factory';
 // rest
-export { RestState } from './src/rest/rest.state';
+export { RestState, RestSerialized } from './src/rest/rest.state';
 // row-details
 export { RowDetails } from './src/row-details/row.details';
 export { RowDetailsLet } from './src/row-details/row.details.let';
diff --git a/packages/qgrid-core/src/column-type/editor.options.d.ts b/packages/qgrid-core/src/column-type/editor.options.d.ts
index 47518901a..8b7b71f81 100644
--- a/packages/qgrid-core/src/column-type/editor.options.d.ts
+++ b/packages/qgrid-core/src/column-type/editor.options.d.ts
@@ -11,43 +11,44 @@ export declare type EditorOptionsTrigger = 'click' | 'custom' | 'focus';
  */
 export interface EditorOptions {
 
-	/**
-	 * Says when cell should go to the edit mode.
-	 *
-	 * * `click` edit mode activates when user clicks on cell.
-	 * * `custom` if user defines own edit mode trigger, like button for reference column edit, this option should be used.
-	 * * `focus` edit mode activates when cell receives focus.
-	 */
-	trigger?: EditorOptionsTrigger;
-
-	/**
-	 * Defines navigation behavior when cell is in edit mode.
-	 *
-	 * * `control` when cell is in edit mode, keyboard navigation events are disabled(in general, `tab` and `shift+tab` still works).
-	 * * `transparent` when cell is in edit mode, keyboard navigation event are still applicable.
-	 */
-	cruise?: EditorOptionsCruise;
-
-	/**
-	 * q-grid model factory, can be used by reference column to draw a another q-grid in edit cell mode.
-	 */
-	modelFactory?: (context: {
-		row: any;
-		column: ColumnModel;
-		getValue: (row: any) => any;
-		reference: { commit: Command; cancel: Command; value: any };
-	}) => Model;
-
-	/**
-	 * Can be used by e.g. `auto-complete` editor to populate list of items.
-	 */
-	fetch?: () => Promise<any> | { subscribe: (x: any) => void } | any;
-
-	/**
-	 * List of actions, can be used by row-options column to draw menu with commands.
-	 */
-	actions?: Action[];
-
-	label?: any;
-	value?: any;
+  /**
+   * Says when cell should go to the edit mode.
+   *
+   * * `click` edit mode activates when user clicks on cell.
+   * * `custom` if user defines own edit mode trigger, like button for reference column edit, this option should be used.
+   * * `focus` edit mode activates when cell receives focus.
+   */
+  trigger?: EditorOptionsTrigger;
+
+  /**
+   * Defines navigation behavior when cell is in edit mode.
+   *
+   * * `control` when cell is in edit mode, keyboard navigation events are disabled(in general, `tab` and `shift+tab` still works).
+   * * `transparent` when cell is in edit mode, keyboard navigation event are still applicable.
+   */
+  cruise?: EditorOptionsCruise;
+
+  /**
+   * q-grid model factory, can be used by reference column to draw a another q-grid in edit cell mode.
+   */
+  modelFactory?: (context: {
+    row: any;
+    column: ColumnModel;
+    getValue: (row: any) => any;
+    reference: { commit: Command; cancel: Command; value: any };
+    createDefaultModel?: () => Model;
+  }) => Model;
+
+  /**
+   * Can be used by e.g. `auto-complete` editor to populate list of items.
+   */
+  fetch?: () => Promise<any> | { subscribe: (x: any) => void } | any;
+
+  /**
+   * List of actions, can be used by row-options column to draw menu with commands.
+   */
+  actions?: Action[];
+
+  label?: any;
+  value?: any;
 }
diff --git a/packages/qgrid-core/src/rest/rest.state.d.ts b/packages/qgrid-core/src/rest/rest.state.d.ts
index ffd9fa5c4..5d2a52593 100644
--- a/packages/qgrid-core/src/rest/rest.state.d.ts
+++ b/packages/qgrid-core/src/rest/rest.state.d.ts
@@ -1,12 +1,14 @@
 import { Model } from '../model/model';
 
+export interface RestSerialized {
+  order: string;
+  filter: string;
+  skip: number;
+  take: number;
+}
+
 export declare class RestState {
   url: string;
   method: string;
-  serialize: (model: Model) => {
-		order: string;
-		filter: string;
-		skip: number;
-		take: number;
-	};
+  serialize: (model: Model) => RestSerialized;
 }
diff --git a/packages/qgrid-core/src/validation/validation.service.d.ts b/packages/qgrid-core/src/validation/validation.service.d.ts
index e2ff1e002..cd3160d10 100644
--- a/packages/qgrid-core/src/validation/validation.service.d.ts
+++ b/packages/qgrid-core/src/validation/validation.service.d.ts
@@ -1,6 +1,6 @@
 export declare interface Validator {
-	validate(value: any): boolean;
-	getErrors(): Array<string>;
+  validate(value: any): boolean;
+  getErrors(): { [key: string]: (Array<string> | string) };
 }
 
 export declare function hasRules(rules: any, key: string): boolean;
diff --git a/packages/qgrid-ngx-examples/src/examples/import-basic/example-import-basic.component.html b/packages/qgrid-ngx-examples/src/examples/import-basic/example-import-basic.component.html
index 08c03edb9..30034f773 100644
--- a/packages/qgrid-ngx-examples/src/examples/import-basic/example-import-basic.component.html
+++ b/packages/qgrid-ngx-examples/src/examples/import-basic/example-import-basic.component.html
@@ -5,7 +5,7 @@
   <q-grid-columns generation="deep">
   </q-grid-columns>
 
-  <q-grid-import options="{head:'numeric'}">
+  <q-grid-import [options]="{head:'numeric'}">
     <ng-template for="trigger"
                  let-$action>
       <button mat-button
diff --git a/packages/qgrid-ngx-plugins/src/lib/action/action.component.ts b/packages/qgrid-ngx-plugins/src/lib/action/action.component.ts
index 6ed8e2662..42a43ef91 100644
--- a/packages/qgrid-ngx-plugins/src/lib/action/action.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/action/action.component.ts
@@ -16,7 +16,7 @@ import { GridPlugin, TemplateHostService } from '@qgrid/ngx';
   providers: [GridPlugin, TemplateHostService],
 })
 export class ActionComponent implements OnInit {
-  @ContentChild(TemplateRef, { static: true }) templateRef: TemplateRef<any>;
+  @ContentChild(TemplateRef, { static: true }) templateRef: TemplateRef<unknown>;
 
   @Input() title: string;
   @Input() icon: string;
diff --git a/packages/qgrid-ngx-plugins/src/lib/autocomplete-editor/autocomplete-editor.component.ts b/packages/qgrid-ngx-plugins/src/lib/autocomplete-editor/autocomplete-editor.component.ts
index 4e3abcf8e..ba0e904b7 100644
--- a/packages/qgrid-ngx-plugins/src/lib/autocomplete-editor/autocomplete-editor.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/autocomplete-editor/autocomplete-editor.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { isArray, predicateFactory } from '@qgrid/core';
+import { ColumnModel, Fetch, isArray, predicateFactory } from '@qgrid/core';
 import { GridPlugin } from '@qgrid/ngx';
 
 @Component({
@@ -13,7 +13,7 @@ export class AutoCompleteEditorComponent {
     return this.plugin.view.edit.cell;
   }
 
-  options: any[] = [];
+  options: unknown[] = [];
 
   // eslint-disable-next-line no-use-before-define
   context: { $implicit: AutoCompleteEditorComponent } = {
@@ -21,7 +21,7 @@ export class AutoCompleteEditorComponent {
   };
 
   get items() {
-    return (this.cell.fetch as any).result;
+    return (this.cell.fetch as Fetch).result as unknown[];
   }
 
   get title() {
@@ -53,12 +53,12 @@ export class AutoCompleteEditorComponent {
     this.options = [];
   }
 
-  itemLabelFactory(column) {
+  itemLabelFactory(column: ColumnModel) {
     const { itemLabel } = column;
     if (itemLabel) {
-      return item => itemLabel(item);
+      return (item: unknown) => itemLabel(item);
     }
 
-    return item => item;
+    return (item: unknown) => item;
   }
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.component.ts b/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.component.ts
index b2b4d6840..5f7ec7ba9 100644
--- a/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.component.ts
@@ -19,8 +19,8 @@ import { BackdropService } from './backdrop.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BackdropComponent implements OnInit, OnDestroy {
-  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<any>;
-  @Output('close') closeEvent = new EventEmitter<any>();
+  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<unknown>;
+  @Output('close') closeEvent = new EventEmitter<void>();
   @Input() propagate = true;
 
   // eslint-disable-next-line no-use-before-define
diff --git a/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.directive.ts b/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.directive.ts
index b29768300..af28d6539 100644
--- a/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/backdrop/backdrop.directive.ts
@@ -14,11 +14,11 @@ import {
 export class BackdropDirective {
   private backdrop: HTMLElement;
 
-  @Output('q-grid-backdrop') close = new EventEmitter<any>();
+  @Output('q-grid-backdrop') close = new EventEmitter<void>();
 
   @Input('q-grid-backdrop-selector') selector = '';
 
-  @Input('q-grid-backdrop-active') set backdropHost(value: any) {
+  @Input('q-grid-backdrop-active') set backdropHost(value: boolean) {
     if (!value) {
       if (this.backdrop) {
         this.backdrop.remove();
@@ -49,6 +49,8 @@ export class BackdropDirective {
     });
   }
 
-  constructor(private zone: NgZone, @Inject(DOCUMENT) private document: any) {
-  }
+  constructor(
+    private zone: NgZone,
+    @Inject(DOCUMENT) private document: Document,
+  ) { }
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/bool-editor/bool-editor.component.ts b/packages/qgrid-ngx-plugins/src/lib/bool-editor/bool-editor.component.ts
index 20123ae30..4389c4520 100644
--- a/packages/qgrid-ngx-plugins/src/lib/bool-editor/bool-editor.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/bool-editor/bool-editor.component.ts
@@ -8,18 +8,20 @@ import {
 } from '@angular/core';
 import { BoolColumnModel } from '@qgrid/core';
 
+type ValueType = unknown;
+
 @Component({
   selector: 'q-grid-bool-editor',
   templateUrl: './bool-editor.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class BoolEditorComponent implements OnInit {
-  private state: any;
+  private state: ValueType;
 
   @Input() autofocus = false;
   @Input() column: BoolColumnModel;
   @Input() label: string;
-  @Output() valueChange = new EventEmitter<any>();
+  @Output() valueChange = new EventEmitter<ValueType>();
 
   // eslint-disable-next-line no-use-before-define
   context: { $implicit: BoolEditorComponent } = {
diff --git a/packages/qgrid-ngx-plugins/src/lib/cell-editor/cell-editor.component.ts b/packages/qgrid-ngx-plugins/src/lib/cell-editor/cell-editor.component.ts
index 37473294a..7ee18335c 100644
--- a/packages/qgrid-ngx-plugins/src/lib/cell-editor/cell-editor.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/cell-editor/cell-editor.component.ts
@@ -16,8 +16,8 @@ import { GridPlugin } from '@qgrid/ngx';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CellEditorComponent implements OnInit {
-  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<any>;
-  @Output('close') closeEvent = new EventEmitter<any>();
+  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<unknown>;
+  @Output('close') closeEvent = new EventEmitter<void>();
 
   // eslint-disable-next-line no-use-before-define
   context: { $implicit: CellEditorComponent } = {
diff --git a/packages/qgrid-ngx-plugins/src/lib/colum-chooser/column-chooser.component.ts b/packages/qgrid-ngx-plugins/src/lib/colum-chooser/column-chooser.component.ts
index ec39076da..4adf8e096 100644
--- a/packages/qgrid-ngx-plugins/src/lib/colum-chooser/column-chooser.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/colum-chooser/column-chooser.component.ts
@@ -38,8 +38,8 @@ export class RootContext {
 export class ColumnChooserComponent implements OnInit, OnChanges {
   private ccState = this.stateAccessor.setter(ColumnChooserState);
 
-  @Output('submit') submitEvent = new EventEmitter<any>();
-  @Output('cancel') cancelEvent = new EventEmitter<any>();
+  @Output('submit') submitEvent = new EventEmitter<void>();
+  @Output('cancel') cancelEvent = new EventEmitter<void>();
 
   context: {
     $implicit: ColumnChooserPlugin;
diff --git a/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter-item.directive.ts b/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter-item.directive.ts
index 4646c8bf5..760101a57 100644
--- a/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter-item.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter-item.directive.ts
@@ -5,7 +5,7 @@ import { ColumnFilterItemListDirective } from './column-filter-item-list.directi
   selector: '[q-grid-column-filter-item]',
 })
 export class ColumnFilterItemDirective implements OnInit {
-  @Input('q-grid-column-filter-item') value: any;
+  @Input('q-grid-column-filter-item') value: string;
 
   $implicit = this;
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter.component.ts b/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter.component.ts
index a0ba184c9..d0cf2b8b7 100644
--- a/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/column-filter/column-filter.component.ts
@@ -13,6 +13,7 @@ import {
   flatten,
   getValue,
   Guard,
+  ReadModel,
   uniq,
 } from '@qgrid/core';
 import {
@@ -26,6 +27,10 @@ import {
 import { ColumnFilterPlugin, ColumnFilterState } from '@qgrid/plugins';
 import { FocusAfterRender } from '../focus/focus.service';
 
+type ReadModelStatesContains<V> = {
+  [K in keyof ReadModel as ReadModel[K] extends (() => Readonly<V>) ? K : never]: ReadModel[K];
+};
+
 @Component({
   selector: 'q-grid-column-filter',
   templateUrl: './column-filter.component.html',
@@ -38,8 +43,8 @@ export class ColumnFilterComponent implements OnInit {
   @Input() column: ColumnModel;
   @Input() search = '';
 
-  @Output('submit') submitEvent = new EventEmitter<any>();
-  @Output('cancel') cancelEvent = new EventEmitter<any>();
+  @Output('submit') submitEvent = new EventEmitter<void>();
+  @Output('cancel') cancelEvent = new EventEmitter<void>();
 
   context: {
     $implicit: ColumnFilterPlugin;
@@ -120,7 +125,7 @@ export class ColumnFilterComponent implements OnInit {
           const isBlank = model.filter().assertFactory().isNull;
           try {
             if (!items.length) {
-              const source = model[columnFilter.state().source];
+              const source = (model as ReadModel)[columnFilter.state().source as keyof ReadModelStatesContains<{ rows: unknown[] }>];
               Guard.notNull(source, 'source');
 
               const sourceState = source();
@@ -128,7 +133,7 @@ export class ColumnFilterComponent implements OnInit {
 
               let values = null;
               if (columnFilterPlugin.column.type === 'array') {
-                values = flatten(sourceState.rows.map(row => getValue(row, column)));
+                values = flatten(sourceState.rows.map((row: unknown) => getValue(row, column)));
               } else {
                 values = sourceState.rows.map(columnFilterPlugin.getValue);
               }
diff --git a/packages/qgrid-ngx-plugins/src/lib/column-sort/column-sort.component.ts b/packages/qgrid-ngx-plugins/src/lib/column-sort/column-sort.component.ts
index cbce1b4a5..8a7d349cd 100644
--- a/packages/qgrid-ngx-plugins/src/lib/column-sort/column-sort.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/column-sort/column-sort.component.ts
@@ -20,7 +20,7 @@ import { FocusAfterRender } from '../focus/focus.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ColumnSortComponent implements AfterViewInit {
-  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<any>;
+  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<unknown>;
   @Input() column: ColumnModel;
 
   // eslint-disable-next-line no-use-before-define
diff --git a/packages/qgrid-ngx-plugins/src/lib/command/command.directive.ts b/packages/qgrid-ngx-plugins/src/lib/command/command.directive.ts
index 8f8913f20..7c1f4b349 100644
--- a/packages/qgrid-ngx-plugins/src/lib/command/command.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/command/command.directive.ts
@@ -17,11 +17,13 @@ import {
 import { Command, CommandManager, Shortcut, ShortcutDispatcher } from '@qgrid/core';
 import { Disposable, GridPlugin } from '@qgrid/ngx';
 
+type CommangArg = unknown;
+
 export class ZoneCommandManager {
   constructor(
     private run: <T>(f: () => T) => T,
     private manager: CommandManager,
-    private commandArg: any,
+    private commandArg: CommangArg,
   ) {
   }
 
@@ -31,7 +33,7 @@ export class ZoneCommandManager {
     );
   }
 
-  filter(commands) {
+  filter(commands: Command[]) {
     return this.manager.filter(commands);
   }
 }
@@ -43,13 +45,13 @@ export class ZoneCommandManager {
 export class CommandDirective implements DoCheck, OnChanges, OnInit, AfterViewInit {
   private isAfterViewInit = false;
 
-  @Input('q-grid-command') command: Command<any>;
-  @Input('q-grid-command-arg') commandArg: any;
+  @Input('q-grid-command') command: Command<CommangArg>;
+  @Input('q-grid-command-arg') commandArg: CommangArg;
   @Input('q-grid-command-use-shortcut') useCommandShortcut: boolean;
   @Input('q-grid-command-event') commandEvent = 'click';
   @Input('q-grid-command-use-zone') useZone: boolean;
   @Input('q-grid-command-host') host: 'grid' | 'document' = 'grid';
-  @Output('q-grid-command-execute') commandExecute = new EventEmitter<any>();
+  @Output('q-grid-command-execute') commandExecute = new EventEmitter<CommangArg>();
 
   constructor(
     private disposable: Disposable,
@@ -64,7 +66,7 @@ export class CommandDirective implements DoCheck, OnChanges, OnInit, AfterViewIn
 
     this.aroundZone(() =>
       nativeElement
-        .addEventListener(this.commandEvent, e => this.execute(e)),
+        .addEventListener(this.commandEvent, (e: MouseEvent) => this.execute(e)),
     );
   }
 
@@ -131,7 +133,7 @@ export class CommandDirective implements DoCheck, OnChanges, OnInit, AfterViewIn
 
         const shortcut = new Shortcut(new ShortcutDispatcher());
 
-        const keyDown = e => {
+        const keyDown = (e: KeyboardEvent) => {
           shortcut.keyDown(e);
         };
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/data-manipulation/data-manipulation.component.ts b/packages/qgrid-ngx-plugins/src/lib/data-manipulation/data-manipulation.component.ts
index ec591f98f..883b3c205 100644
--- a/packages/qgrid-ngx-plugins/src/lib/data-manipulation/data-manipulation.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/data-manipulation/data-manipulation.component.ts
@@ -21,7 +21,7 @@ export class DataManipulationComponent implements OnInit, OnChanges {
     $implicit: DataManipulationPlugin;
   };
 
-  @Input('rowFactory') set dataManipulationRowFactory(rowFactory: (x: any) => any) { this.dmState({ rowFactory }); }
+  @Input('rowFactory') set dataManipulationRowFactory(rowFactory: (x: unknown) => unknown) { this.dmState({ rowFactory }); }
 
   constructor(
     private plugin: GridPlugin,
diff --git a/packages/qgrid-ngx-plugins/src/lib/data-provider/data-provider.component.ts b/packages/qgrid-ngx-plugins/src/lib/data-provider/data-provider.component.ts
index f8da3772a..ff9229fe3 100644
--- a/packages/qgrid-ngx-plugins/src/lib/data-provider/data-provider.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/data-provider/data-provider.component.ts
@@ -17,11 +17,11 @@ import { GridModel, GridPlugin } from '@qgrid/ngx';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DataProviderComponent implements OnInit {
-  private next: (rows: any[]) => void;
+  private next: (rows: unknown[]) => void;
 
   @Output() requestRows = new EventEmitter<GridModel>();
 
-  @Input('rows') set rows(value: any[]) {
+  @Input('rows') set rows(value: unknown[]) {
     if (Array.isArray(value)) {
       const next = this.next;
       if (next) {
diff --git a/packages/qgrid-ngx-plugins/src/lib/date/date.directive.ts b/packages/qgrid-ngx-plugins/src/lib/date/date.directive.ts
index 53f1ccff3..dee66985e 100644
--- a/packages/qgrid-ngx-plugins/src/lib/date/date.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/date/date.directive.ts
@@ -9,9 +9,9 @@ export class DateDirective {
   private toMidnight: (x: Date | string) => Date = parseFactory('date');
 
   constructor(
-    templateRef: TemplateRef<any>,
+    templateRef: TemplateRef<unknown>,
     viewContainerRef: ViewContainerRef,
-		private dateService: DateService,
+    private dateService: DateService,
   ) {
     viewContainerRef.createEmbeddedView(templateRef, { $implicit: this });
   }
diff --git a/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form-trigger.component.ts b/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form-trigger.component.ts
index d80adc0b0..46594e986 100644
--- a/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form-trigger.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form-trigger.component.ts
@@ -7,9 +7,10 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 })
 export class EditFormTriggerComponent {
   @Input() caption: string;
-  @Input() row: any;
+  @Input() row: unknown;
 
-  context: any = {
+  // eslint-disable-next-line no-use-before-define
+  context: { $implicit: EditFormTriggerComponent } = {
     $implicit: this,
   };
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form.component.ts b/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form.component.ts
index eb55c6915..4945fb066 100644
--- a/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/edit-form/edit-form.component.ts
@@ -17,7 +17,7 @@ import { EditFormPanelPlugin } from '@qgrid/plugins';
 })
 export class EditFormComponent implements OnInit {
   @Input() caption: string;
-  @Input() row: any;
+  @Input() row: unknown;
 
   @Output() cancel = new EventEmitter();
   @Output() reset = new EventEmitter();
diff --git a/packages/qgrid-ngx-plugins/src/lib/export/export.component.ts b/packages/qgrid-ngx-plugins/src/lib/export/export.component.ts
index 6a63aedba..037e73c06 100644
--- a/packages/qgrid-ngx-plugins/src/lib/export/export.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/export/export.component.ts
@@ -12,13 +12,13 @@ import { ExportPlugin } from '@qgrid/plugins';
 
 @Component({
   selector: 'q-grid-export',
-  templateUrl: './export.component.html',
+  template: '',
   providers: [TemplateHostService, GridPlugin],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ExportComponent implements AfterViewInit {
-  @Input() type: string;
-  @ContentChild(TemplateRef) templateRef: TemplateRef<any>;
+  @Input() type: Exclude<keyof ExportPlugin, 'type'>;
+  @ContentChild(TemplateRef) templateRef: TemplateRef<unknown>;
 
   // eslint-disable-next-line no-use-before-define
   context: { $implicit: ExportComponent } = {
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/evaluate.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/evaluate.ts
index 9d27708f0..a6e02c8f2 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/evaluate.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/evaluate.ts
@@ -1,41 +1,41 @@
 import { isArray, isFunction, isObject } from '@qgrid/core';
 
-export function evaluateFactory(expression, args) {
-  return visit;
+export type Evaluated<T> =
+  T extends (...x: any[]) => infer X ? Evaluated<X> :
+  T extends Array<infer X> ? Array<Evaluated<X>> :
+  T extends { [K in keyof T]: unknown } ? { [K in keyof T]: Evaluated<T[K]> } :
+  T;
 
-  function visit(value) {
+export type Evaluate = <T>(value: T | T[] | ((...x: any[]) => T)) => Evaluated<T>;
+
+export function evaluateFactory<K>(expression: K, args: unknown[]) {
+  return visit as Evaluate;
+
+  function visit<T>(value: T | T[] | ((...x: any[]) => T)): Evaluated<T> | Evaluated<T>[] {
     if (isArray(value)) {
-      return visitArray(value);
+      return visitArray<T>(value as T[]);
     } else if (isFunction(value)) {
-      return visitFunction(value);
+      return visitFunction<T>(value as ((...x: any[]) => T));
     } else if (isObject(value)) {
-      return visitObject(value);
+      return visitObject(value as T);
     }
-
-    return value;
+    return value as Evaluated<T>;
   }
 
-  function visitObject(inst) {
-    const keys = Object.keys(inst);
-    const length = keys.length;
-    const result = {};
-    for (let i = 0; i < length; i++) {
-      const key = keys[i];
-      result[key] = visit(inst[key]);
-    }
-
-    return result;
+  function visitObject<T>(inst: T): Evaluated<T> {
+    return (Object.keys(inst) as Array<keyof T>)
+      .reduce((memo, key) => ({ ...memo, [key]: visit(inst[key]) }), {} as Evaluated<T>);
   }
 
-  function visitArray(list) {
-    const result = [];
+  function visitArray<T>(list: T[]) {
+    const result = [] as Evaluated<T>[];
     for (let i = 0, length = list.length; i < length; i++) {
-      result[i] = visit(list[i]);
+      result[i] = visit(list[i]) as Evaluated<T>;
     }
     return result;
   }
 
-  function visitFunction(delegate) {
-    return delegate.apply(expression, args);
+  function visitFunction<T>(delegate: (...argums: any[]) => T): Evaluated<T> {
+    return delegate.apply(expression, args) as Evaluated<T>;
   }
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/watch.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/watch.ts
index 10fe08f35..3b04ab6a8 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/watch.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/digest/watch.ts
@@ -1,27 +1,33 @@
-import { evaluateFactory } from './evaluate';
+import { Expression } from '../model/expression';
+import { Line } from '../model/line';
+import { Node } from '../model/node';
+import { Evaluate, evaluateFactory, Evaluated } from './evaluate';
 
 export class Watcher {
-  private evaluate: (x: any) => any;
-  private oldValue: any;
+  private evaluate: Evaluate;
+  private oldValue: Evaluated<Expression[keyof Expression]>;
   private isFirstRun = true;
 
   constructor(
-		private expression: any,
-		private key: string,
-		private handler: (context: any, e: any) => void,
-		private args = []) {
-
+    private expression: Expression,
+    private key: keyof Expression,
+    private handler: (...params: any[]) => void,
+    private args: [Node, Line],
+  ) {
     this.evaluate = evaluateFactory(expression, args);
-    this.oldValue = this.evaluate(expression[key]);
+    this.oldValue = this.evaluate<Expression[keyof Expression]>(expression[key]);
   }
 
   detect() {
     const inst = this.expression[this.key];
-    const newValue = this.evaluate(inst);
+    const newValue: Evaluated<Expression[keyof Expression]> = this.evaluate<Expression[keyof Expression]>(inst);
     if (this.isFirstRun || this.oldValue !== newValue) {
       this.isFirstRun = false;
-
-      this.handler.apply(this.expression, [newValue, this.oldValue].concat(this.args));
+      this.handler.apply(this.expression, [
+        newValue,
+        this.oldValue,
+        ...this.args,
+      ]);
       this.oldValue = newValue;
     }
   }
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-class.directive.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-class.directive.ts
index 4d495a7f3..0479f6ad6 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-class.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-class.directive.ts
@@ -7,28 +7,33 @@ import {
   Optional,
 } from '@angular/core';
 import { isArray } from '@qgrid/core';
-import { evaluateFactory } from './digest/evaluate';
+import { Evaluate, evaluateFactory } from './digest/evaluate';
 import { EbNodeComponent } from './eb-node.component';
+import { Expression } from './model/expression';
+
+type EbClassType = string | string[] | Record<string, unknown>;
 
 @Directive({
   selector: '[q-grid-eb-class]',
 })
 export class EbClassDirective implements OnInit, DoCheck {
-  private evaluate: (value: any) => any;
-  private oldClassList: Array<string> = [];
+  private evaluate: Evaluate;
+  private oldClassList: string[] = [];
 
-  @Input('q-grid-eb-class') klass: any;
-  @Input('q-grid-eb-class-model') model: any;
+  @Input('q-grid-eb-class') class: EbClassType;
+  @Input('q-grid-eb-class-model') model: Expression;
 
-  constructor(private elementRef: ElementRef, @Optional() private node: EbNodeComponent) {
-  }
+  constructor(
+    private elementRef: ElementRef,
+    @Optional() private node: EbNodeComponent,
+  ) { }
 
   ngOnInit() {
     this.evaluate = evaluateFactory(this.model, [this.node ? this.node.model : null]);
   }
 
   ngDoCheck() {
-    const result = this.evaluate(this.klass);
+    const result = this.evaluate<EbClassType>(this.class);
     if (result) {
       const classList = this.fetchClasses(result);
       if (this.oldClassList.length !== classList.length
@@ -46,16 +51,16 @@ export class EbClassDirective implements OnInit, DoCheck {
     }
   }
 
-  private fetchClasses(meta) {
+  private fetchClasses(meta: EbClassType): string[] {
     if (isArray(meta)) {
-      return meta;
+      return meta as string[];
     }
 
     const keys = Object.keys(meta);
     const classList = [];
     for (let i = 0, length = keys.length; i < length; i++) {
       const key = keys[i];
-      if (meta[key]) {
+      if ((meta as { [key: string]: unknown })[key]) {
         classList.push(key);
       }
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-expression.component.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-expression.component.ts
index 13335a5cd..4d3fe1118 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-expression.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-expression.component.ts
@@ -1,5 +1,6 @@
 import { Component, DoCheck, Input, OnInit } from '@angular/core';
 import { Watcher } from './digest/watch';
+import { Expression } from './model/expression';
 import { Line } from './model/line';
 import { Node } from './model/node';
 
@@ -12,14 +13,14 @@ export class EbExpressionComponent implements OnInit, DoCheck {
 
   @Input() node: Node;
   @Input() line: Line;
-  @Input() model: any;
+  @Input() model: Expression;
 
-  context: { $implicit: any; node: Node; line: Line };
+  context: { $implicit: Expression; node: Node; line: Line };
 
   ngOnInit() {
     this.context = { $implicit: this.model, node: this.node, line: this.line };
 
-    const $watch = this.model.$watch;
+    const { $watch } = this.model;
     if ($watch) {
       this.watchers =
         Object
@@ -27,9 +28,10 @@ export class EbExpressionComponent implements OnInit, DoCheck {
           .map(key =>
             new Watcher(
               this.model,
-              key,
-              $watch[key],
-              [this.node, this.line]),
+              key as keyof Expression,
+              $watch[key as keyof Watcher],
+              [this.node, this.line],
+            ),
           );
     }
   }
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.component.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.component.ts
index 88969ae46..52f2dee8c 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.component.ts
@@ -9,10 +9,11 @@ import { Node } from './model/node';
 export class EbNodeComponent {
   @Input() model: Node;
 
-  constructor(public service: EbNodeService) {
-  }
+  constructor(
+    public service: EbNodeService,
+  ) { }
 
-  select(e) {
+  select(e: MouseEvent) {
     e.stopPropagation();
 
     if (this.model.parent) {
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.service.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.service.ts
index cf3b5f7be..1ec1e18d1 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.service.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb-node.service.ts
@@ -2,8 +2,8 @@ import { EventEmitter, Injectable } from '@angular/core';
 import { Node } from './model/node';
 
 export interface EbNodeServiceEventArg<T> {
-	newValue: T;
-	oldValue: T;
+  newValue: T;
+  oldValue: T;
 }
 
 @Injectable()
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb.module.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb.module.ts
index 72e9f95ed..ca5498924 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb.module.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/eb.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { TemplateModule } from '@qgrid/ngx';
 import { SerializationService } from './serialization.service';
 import { EbNodeComponent } from './eb-node.component';
 import { EbExpressionComponent } from './eb-expression.component';
 import { EbClassDirective } from './eb-class.directive';
 import { EbNodeService } from './eb-node.service';
-import { TemplateModule } from '@qgrid/ngx';
 
 @NgModule({
   imports: [
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.builder.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.builder.ts
index 84a95a64a..7d9613eb3 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.builder.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.builder.ts
@@ -5,26 +5,26 @@ import { Expression, GroupExpression } from './expression';
 import { GroupSchema } from './group.schema';
 import { Line } from './line';
 import { Node } from './node';
-import { nodeSchema } from './node.schema';
+import { nodeSchema, Schema } from './node.schema';
 import { EmptyStatement, IStatement } from './statement';
 
-
 export class ExpressionBuilder {
-  constructor(private settings) {
-  }
+  constructor(
+    private settings: Partial<IStatement>,
+  ) { }
 
-  build<T>(statements: Array<IStatement>): T {
+  build<T>(statements: IStatement[]): T {
     const NodeSchemaT = nodeSchema(GroupSchema);
 
     const settings = this.settings;
     statements
       .concat([new EmptyStatement()])
       .forEach(statement => {
-        const factory = function (...args) {
+        const factory = function (this: Schema, ...args: [Expression] | [string, Expression]) {
           let id = guid();
           let sampleExpression: Expression;
           if (args.length > 1) {
-            id = args[0];
+            id = args[0] as string;
             sampleExpression = args[1];
           } else if (args.length === 1) {
             sampleExpression = args[0];
@@ -49,20 +49,20 @@ export class ExpressionBuilder {
             line.add(group);
             patch.methodsOf(expression).with(node, line);
 
-            const keys = Object.keys(expression);
+            const keys = Object.keys(expression) as Array<keyof Expression>;
 
             keys.forEach(key => {
-              const sourceFunction = expression[key];
+              const sourceFunction = expression[key] as (...arg: unknown[]) => boolean;
 
               if (isFunction(sourceFunction)) {
-                expression[key] = (...context) => {
+                expression[key] = (...context: unknown[]) => {
                   const result = sourceFunction.apply(expression, context);
 
                   // TODO add decorator for mutable methods instead of trigger
                   if (!line.immutable) {
                     expression.method = expression.method || [];
-                    if (expression.method.indexOf(key) < 0) {
-                      expression.method.push(key);
+                    if (expression.method.indexOf(key as string) < 0) {
+                      expression.method.push(key as string);
                     }
 
                     line.immutable = true;
@@ -81,17 +81,17 @@ export class ExpressionBuilder {
           return this;
         };
 
-        const groupFactory = function (...args) {
+        const groupFactory = function (this: Schema, ...args: (string | Expression)[]) {
           let id = guid();
           let sampleExpression: Expression;
           if (args.length > 1) {
-            id = args[0];
-            sampleExpression = args[1];
+            id = args[0] as string;
+            sampleExpression = args[1] as Expression;
           } else if (args.length === 1) {
-            sampleExpression = args[0];
+            sampleExpression = args[0] as Expression;
           }
 
-          const build = function (node, line, expressionGroup) {
+          const build = function (node: Node, line: Line, expressionGroup: GroupExpression) {
             const expression =
               utility.defaults<Expression>(
                 sampleExpression,
@@ -114,11 +114,11 @@ export class ExpressionBuilder {
           return this;
         };
 
-        NodeSchemaT.prototype[statement.type] = factory;
-        GroupSchema.prototype[statement.type] = groupFactory;
+        (NodeSchemaT as typeof NodeSchemaT & { prototype: any }).prototype[statement.type as keyof typeof NodeSchemaT] = factory;
+        (GroupSchema as typeof GroupSchema & { prototype: any }).prototype[statement.type as keyof typeof GroupSchema] = groupFactory;
       });
 
     // TODO: think how to avoid this
-    return new NodeSchemaT() as T;
+    return new NodeSchemaT() as any as T;
   }
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.ts
index e00cb1e7c..86cee4e77 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/expression.ts
@@ -1,8 +1,14 @@
+import { Watcher } from '../digest/watch';
+
 export abstract class Expression {
+  [key: string]: any;
   id: string;
   type: string;
   templateUrl = '';
   method: string[] = [];
+  value?: string | null;
+  $watch?: Watcher;
+  isValid?(): boolean;
 }
 
 export class GroupExpression extends Expression {
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/group.schema.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/group.schema.ts
index 1ebf04728..beb10631c 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/group.schema.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/group.schema.ts
@@ -3,10 +3,12 @@ import { Node } from './node';
 import { GroupExpression } from './expression';
 
 export class GroupSchema {
-  plan: Array<(node: Node, line: Line, group: GroupExpression) => void> = [];
+  plan: ((node: Node, line: Line, group: GroupExpression) => void)[] = [];
 
-  constructor(public node: Node, public line: Line) {
-  }
+  constructor(
+    public node: Node,
+    public line: Line,
+  ) { }
 
   apply(group: GroupExpression) {
     this.plan.forEach(p => p(this.node, this.line, group));
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/line.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/line.ts
index 54df05c93..7aae47aa5 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/line.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/line.ts
@@ -5,44 +5,47 @@ import { GroupSchema } from './group.schema';
 import { Node } from './node';
 
 interface ExpressionEntry {
-	index: number;
-	expression: Expression;
-	parent: GroupExpression;
+  index: number;
+  expression: Expression;
+  parent: GroupExpression;
 }
 
 export class Line {
   immutable = true;
-  readonly expressions: Expression[] = [];
+  readonly expressions: GroupExpression[] = [];
 
-  constructor(private GroupSchemaT: typeof GroupSchema) {
-  }
+  constructor(
+    private GroupSchemaT: typeof GroupSchema,
+  ) { }
 
-  add(expression: Expression) {
+  add(expression: GroupExpression) {
     this.expressions.push(expression);
   }
 
-  clone(id: string) {
-    return cloneDeep(this.get(id)) as Expression;
+  clone(id: string): GroupExpression {
+    return cloneDeep(this.get(id));
   }
 
-  get(id: string) {
+  get(id: string): GroupExpression {
     const expression = this.findById(this.expressions, id);
     if (!expression) {
       throw new GridError('line', `Expression ${id} not found`);
     }
 
-    return expression.expression;
+    return expression.expression as GroupExpression;
   }
 
-  put(id: string, node: Node, build) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  put<T extends { apply: (...args: any[]) => any }>(id: string, node: Node, build: (schema: T) => void) {
     const index = this.getIndex(id);
-    const schema = new this.GroupSchemaT(node, this);
+    const groupSchema = new this.GroupSchemaT(node, this);
     const group = new GroupExpression();
 
     const item = this.findById(this.expressions, id);
     if (item.expression instanceof GroupExpression) {
-      build(schema);
-      schema.apply(group);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      build(groupSchema as any);
+      groupSchema.apply(group);
       group.id = id;
       this.expressions.splice(index, 1, group);
       this.immutable = false;
@@ -51,7 +54,7 @@ export class Line {
     }
   }
 
-  remove(id) {
+  remove(id: string) {
     const item = this.findById(this.expressions, id);
     if (item.expression instanceof GroupExpression) {
       item.expression.expressions = [];
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.schema.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.schema.ts
index 671439f94..36b9fafc8 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.schema.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.schema.ts
@@ -5,22 +5,36 @@ import { Line } from './line';
 import { Node } from './node';
 
 export interface INodeSchema {
-	schemaMap: { [key: string]: INodeSchema };
-
-	apply(node?: Node): Node;
-	attr(key: string, value: any): INodeSchema;
-	node(id: string, build: (schema: INodeSchema) => void): INodeSchema;
-	group(id: string, build: (schema: GroupSchema) => void): INodeSchema;
-	get(id: string): INodeSchema;
-	materialize(id: string): Node;
+  schemaMap: { [key: string]: INodeSchema };
+
+  apply(node?: Node): Node;
+  attr(key: string, value: unknown): INodeSchema;
+  node(id: string, build: (schema: INodeSchema) => void): INodeSchema;
+  group(id: string, build: (schema: GroupSchema) => void): INodeSchema;
+  get(id: string): INodeSchema;
+  materialize(id: string): Node;
 }
 
-export function nodeSchema(GroupSchemaT: typeof GroupSchema): any {
-  return class NodeSchema implements INodeSchema {
-    plan = [];
-    planMap = {};
+export abstract class Schema implements INodeSchema {
+  schemaMap: { [key: string]: INodeSchema } = {};
+  plan: ((node: Node, line?: Line, expressionGroup?: GroupExpression) => ReturnType<Node['attr']> | Node)[] = [];
+  planMap: { [key: string]: (node: Node, line: Line) => Node } = {};
 
-    constructor(public schemaMap = {}) {
+  abstract apply(node?: Node): Node;
+  abstract attr(key: string, value: unknown): INodeSchema;
+  abstract node(id: string, build: (schema: INodeSchema) => void): INodeSchema;
+  abstract group(id: string, build: (schema: GroupSchema) => void): INodeSchema;
+  abstract get(id: string): INodeSchema;
+  abstract materialize(id: string): Node;
+
+}
+
+export function nodeSchema(GroupSchemaT: typeof GroupSchema) {
+  return class NodeSchema extends Schema {
+    constructor(
+      public schemaMap: { [key: string]: INodeSchema } = {},
+    ) {
+      super();
     }
 
     clone(): INodeSchema {
@@ -30,7 +44,7 @@ export function nodeSchema(GroupSchemaT: typeof GroupSchema): any {
       return schema;
     }
 
-    attr(key: string, value: any) {
+    attr(key: string, value: string): INodeSchema {
       this.plan.push(node => node.attr(key, value));
       return this;
     }
@@ -46,7 +60,7 @@ export function nodeSchema(GroupSchemaT: typeof GroupSchema): any {
       return node;
     }
 
-    node(id: string, build: (schema: INodeSchema) => void) {
+    node(id: string, build: (schema: INodeSchema) => void): INodeSchema {
       if (!build) {
         throw new GridError('node.schema', 'Build function is not defined');
       }
@@ -66,12 +80,12 @@ export function nodeSchema(GroupSchemaT: typeof GroupSchema): any {
       return this;
     }
 
-    group(id: string, build: (schema: GroupSchema) => void) {
+    group(id: string, build: (schema: GroupSchema) => void): INodeSchema {
       if (!build) {
         throw new GridError('node.schema', 'Build function is not defined');
       }
 
-      const buildGroup = (node, line) => {
+      const buildGroup = (node: Node, line: Line) => {
         const group = new GroupExpression();
         group.id = id;
 
@@ -98,7 +112,7 @@ export function nodeSchema(GroupSchemaT: typeof GroupSchema): any {
       return schema;
     }
 
-    materialize(id: string): Node {
+    materialize(id: string) {
       const schema = this.get(id);
       return schema.apply(new Node(id, schema));
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.ts
index 7dde1ae70..d83612a26 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/node.ts
@@ -1,18 +1,23 @@
 import { GridError } from '@qgrid/ngx';
 import { Line } from './line';
+import { INodeSchema } from './node.schema';
 
 export class Node {
-  readonly attributes: { [key: string]: any } = {};
+  readonly attributes: { [key: string]: string } = {};
   // eslint-disable-next-line no-use-before-define
   children: Node[] = [];
   level: number;
   line: Line;
 
-  constructor(public id: string, public schema, public parent?: Node) {
+  constructor(
+    public id: string,
+    public schema: INodeSchema,
+    public parent?: Node,
+  ) {
     this.level = parent ? parent.level + 1 : 0;
   }
 
-  attr(key: string, value?) {
+  attr(key: string, value?: string): string | Record<string, unknown> {
     if (arguments.length === 2) {
       this.attributes[key] = value;
     } else {
@@ -20,8 +25,7 @@ export class Node {
     }
   }
 
-  classes() {
-  }
+  classes() { }
 
   addChildAfter(child: Node, after?: Node) {
     const index = after ? this.children.indexOf(after) : this.children.length - 1;
@@ -71,7 +75,7 @@ export class Node {
     this.children = [];
   }
 
-  toString(indent = 0) {
+  toString(indent = 0): string {
     return Array(indent).join('-') + ' ' + this.level + '\n' +
       this.children
         .map(child => child.toString(indent + 1))
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/statement.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/statement.ts
index dff80d7b3..7e1a4b1b6 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/statement.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/model/statement.ts
@@ -1,7 +1,7 @@
 export interface IStatement {
-	type: string;
-	templateKey: string;
-	defaults?: any;
+  type: string;
+  templateKey: string;
+  defaults?: unknown;
 }
 
 export class EmptyStatement implements IStatement {
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/patch.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/patch.ts
index b8c35aa18..5c36b320d 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/patch.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/patch.ts
@@ -1,6 +1,8 @@
 import { isFunction } from '@qgrid/core';
 
-export function method(inst: any, key: string) {
+type ObjectWithFn = Record<string, (...args: unknown[]) => unknown>;
+
+export function method<T extends ObjectWithFn>(inst: T, key: string) {
   const sourceFn = inst[key];
 
   return {
@@ -8,39 +10,39 @@ export function method(inst: any, key: string) {
   };
 }
 
-export function methodsOf(inst: any) {
-  const keys = Object.keys(inst);
+export function methodsOf<T extends ObjectWithFn>(inst: T) {
+  const keys = Object.keys(inst) as Array<keyof T>;
   const length = keys.length;
-  const patch = {};
+  const patch = {} as { [key in keyof T]: { with: (...args: unknown[]) => unknown } };
 
   for (let i = 0; i < length; i++) {
     const key = keys[i];
     if (isFunction(inst[key])) {
-      patch[key] = method(inst, key);
+      patch[key] = method(inst, key as string);
     }
   }
 
   return {
-    with: (...args) => {
-      const patchKeys = Object.keys(patch);
+    with: (...args: unknown[]) => {
+      const patchKeys = Object.keys(patch) as Array<keyof T>;
       const patchLength = patchKeys.length;
 
       for (let i = 0; i < patchLength; i++) {
         const key = patchKeys[i];
 
-        inst.action = key;
+        (inst as T & { action: keyof T }).action = key;
         patch[key].with.apply(inst, args);
       }
     },
   };
 }
 
-export function withFactory(inst, key, sourceFn) {
-  const withFn = (...withArgs) =>
-    inst[key] = (...keyArgs) =>
-      sourceFn.apply(inst, withArgs.concat(keyArgs));
+export function withFactory(inst: ObjectWithFn, key: string, sourceFn: (...args: unknown[]) => unknown) {
+  const withFn = (...withArgs: unknown[]) =>
+    inst[key] = (...keyArgs: unknown[]) => sourceFn.apply(inst, withArgs.concat(keyArgs));
 
-  (withFn as any).decorator = (...args) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  (withFn as any).decorator = (...args: any[]) => {
     const decorate = args[0];
     args = args.slice(1);
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/serialization.service.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/serialization.service.ts
index 54d8226fe..bacbb771d 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/serialization.service.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/serialization.service.ts
@@ -1,14 +1,15 @@
 /* eslint-disable no-use-before-define */
 import { Injectable } from '@angular/core';
-import { GroupExpression } from './model/expression';
+import { Expression, GroupExpression } from './model/expression';
 import { Line } from './model/line';
 import { Node } from './model/node';
 import { INodeSchema } from './model/node.schema';
 import { indexOf, override } from './utility';
 
 class Serializer {
-  constructor(private node: Node) {
-  }
+  constructor(
+    private node: Node,
+  ) { }
 
   serialize(): ISerializationNode {
     const groups = this.node.line.expressions.map(expr => this.serializeGroup(expr));
@@ -21,7 +22,7 @@ class Serializer {
     };
   }
 
-  serializeGroup(group): ISerializationGroup {
+  serializeGroup(group: GroupExpression): ISerializationGroup {
     return {
       id: group.id,
       expressions: group.expressions
@@ -30,14 +31,14 @@ class Serializer {
     };
   }
 
-  serializeExpression(expression): ISerializationExpression {
+  serializeExpression(expression: ISerializationExpression) {
     const result = {} as ISerializationExpression;
 
-    const serializeAttr = this.node.attr('serialize');
+    const serializeAttr = this.node.attr('serialize') as { [key: string]: (keyof ISerializationExpression)[] };
     const serializableProps = serializeAttr[expression.id];
     for (let i = 0, length = serializableProps.length; i < length; i++) {
       const prop = serializableProps[i];
-      result[prop] = expression[prop];
+      result[prop] = expression[prop] as string & string[];
     }
 
     result.id = expression.id;
@@ -48,19 +49,19 @@ class Serializer {
   }
 
   serializeAttributes(node: Node) {
-    const serializeAttr = node.attr('serialize');
+    const serializeAttr = node.attr('serialize') as { ['@attr']: string[] };
     if (serializeAttr && serializeAttr['@attr']) {
-      const props = serializeAttr['@attr'];
+      const props: string[] = serializeAttr['@attr'];
       return props.reduce((memo, attr) => {
         memo[attr] = node.attr(attr);
         return memo;
-      }, {});
+      }, {} as { [key: string]: string | Record<string, unknown> });
     }
     return {};
   }
 
-  canSerialize(expression) {
-    const serializeAttr = this.node.attr('serialize');
+  canSerialize(expression: Expression) {
+    const serializeAttr = this.node.attr('serialize') as { [key: string]: string[] };
     if (!serializeAttr) {
       return false;
     }
@@ -71,8 +72,9 @@ class Serializer {
 }
 
 class Deserializer {
-  constructor(private schema: INodeSchema) {
-  }
+  constructor(
+    private schema: INodeSchema,
+  ) { }
 
   deserialize(data: ISerializationNode, parent: Node = null, nodeMap?: { [key: string]: Node }) {
     nodeMap = nodeMap || {};
@@ -117,7 +119,7 @@ class Deserializer {
     const dataExpressions = dataGroup.expressions;
     const length = dataExpressions.length;
 
-    let index;
+    let index: number;
     for (let i = 0; i < length; i++) {
       const dataExp = dataExpressions[i];
       index = indexOf(group.expressions, expr => expr.id === dataExp.id);
@@ -149,9 +151,11 @@ function traverse(node: Node, map: { [key: string]: Node }) {
 
 export declare interface ISerializationNode {
   id: string;
-  attributes: any;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  attributes: { [key: string]: any };
   children: ISerializationNode[];
   line: ISerializationGroup[];
+  kind?: string;
 }
 
 export declare interface ISerializationGroup {
@@ -162,7 +166,9 @@ export declare interface ISerializationGroup {
 export declare interface ISerializationExpression {
   id: string;
   type: string;
-  method: Array<string>;
+  method: string[];
+  value?: string | null;
+  values?: string[];
 }
 
 @Injectable()
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/traverse.service.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/traverse.service.ts
index 1560040e3..58d30e75c 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/traverse.service.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/traverse.service.ts
@@ -1,6 +1,10 @@
+import { GroupExpression, Expression } from './model/expression';
+import { Line } from './model/line';
 import { Node } from './model/node';
 
-export class TraverseService {
+type TraverseReduce<T> = (memo: T, expresseion: Expression, line: Line, node: Node) => T;
+
+export class TraverseService<T> {
   findUp(node: Node, test: (foundNode: Node) => boolean) {
     while (node) {
       if (test(node)) {
@@ -29,7 +33,7 @@ export class TraverseService {
     return null;
   }
 
-  depth(root: Node): (reduce: any, memo: any) => any {
+  depth(root: Node): (reduce: TraverseReduce<T>, memo: T) => T {
     return (reduce, memo) => {
       memo = this.visitLine(reduce, memo, root, root.line);
 
@@ -44,8 +48,8 @@ export class TraverseService {
     };
   }
 
-  private visitLine(reduce, memo, node, line) {
-    const groups = line.expressions;
+  private visitLine(reduce: TraverseReduce<T>, memo: T, node: Node, line: Line) {
+    const groups = line.expressions as GroupExpression[];
     const length = groups.length;
 
     for (let i = 0; i < length; i++) {
@@ -55,7 +59,7 @@ export class TraverseService {
     return memo;
   }
 
-  private visitGroup(reduce, memo, node, line, group) {
+  private visitGroup(reduce: TraverseReduce<T>, memo: T, node: Node, line: Line, group: GroupExpression) {
     const expressions = group.expressions;
     const length = expressions.length;
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/expression-builder/utility.ts b/packages/qgrid-ngx-plugins/src/lib/expression-builder/utility.ts
index cbb262af4..15ad7f044 100644
--- a/packages/qgrid-ngx-plugins/src/lib/expression-builder/utility.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/expression-builder/utility.ts
@@ -1,6 +1,6 @@
 import { clone } from '@qgrid/core';
 
-export function indexOf(array, predicate) {
+export function indexOf<T>(array: T[], predicate: (val: T, i: number) => boolean) {
   for (let i = 0, length = array.length; i < length; i++) {
     if (predicate(array[i], i)) {
       return i;
@@ -9,18 +9,17 @@ export function indexOf(array, predicate) {
   return -1;
 }
 
-export function defaults<T>(...args: any[]): T {
-  const dst = args[0];
+export function defaults<T>(dst?: T, ...args: Partial<T>[]): T {
   const result = clone(dst) as T;
 
-  for (let i = 1, sourcesLength = args.length; i < sourcesLength; i++) {
+  for (let i = 0, sourcesLength = args.length; i < sourcesLength; i++) {
     const source = args[i];
 
     if (!source) {
       continue;
     }
 
-    const keys = Object.keys(source);
+    const keys = Object.keys(source) as Array<keyof T>;
 
     for (let k = 0, keysLength = keys.length; k < keysLength; k++) {
       const key = keys[k];
@@ -33,8 +32,8 @@ export function defaults<T>(...args: any[]): T {
   return result;
 }
 
-export function override(dst, src) {
-  const keys = Object.keys(src);
+export function override<T>(dst: T, src: Partial<T>): T {
+  const keys = Object.keys(src) as Array<keyof T>;
   const length = keys.length;
 
   for (let i = 0; i < length; i++) {
diff --git a/packages/qgrid-ngx-plugins/src/lib/file/file.directive.ts b/packages/qgrid-ngx-plugins/src/lib/file/file.directive.ts
index abef0d07b..5fb1238d9 100644
--- a/packages/qgrid-ngx-plugins/src/lib/file/file.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/file/file.directive.ts
@@ -16,10 +16,10 @@ import { BackdropService } from '../backdrop/backdrop.service';
 })
 export class FileDirective {
   private reader = new FileReader();
-  private _value: any;
+  private _value: ArrayBuffer | string;
   private _label: string;
 
-  @Output('q-grid-fileChange') valueChange = new EventEmitter<any>();
+  @Output('q-grid-fileChange') valueChange = new EventEmitter<ArrayBuffer | string>();
   @Output('q-grid-file-labelChange') labelChange = new EventEmitter<string>();
 
   @Input('q-grid-file-is-valid') isValid: (name: string) => boolean = yes;
@@ -28,7 +28,7 @@ export class FileDirective {
     return this._value;
   }
 
-  set value(value: any) {
+  set value(value: ArrayBuffer | string) {
     if (value !== this._value) {
       this._value = value;
       this.valueChange.emit(value);
@@ -49,8 +49,8 @@ export class FileDirective {
   constructor(
     @Optional() private backdropService: BackdropService,
     disposable: Disposable,
-    elementRef: ElementRef) {
-
+    elementRef: ElementRef,
+  ) {
     const listener = new EventListener(elementRef.nativeElement, new EventManager(this));
 
     disposable.add(listener.on('change', this.onUpload));
@@ -61,8 +61,8 @@ export class FileDirective {
     this.reader.onloadend = e => this.onLoadEnd(e);
   }
 
-  onUpload(e) {
-    const { files } = e.target;
+  onUpload(e: Event) {
+    const { files } = <HTMLInputElement>e.target;
     const file = files[0];
     if (file && this.isValid(file.name)) {
       this.reader.readAsDataURL(file);
@@ -70,7 +70,7 @@ export class FileDirective {
     }
   }
 
-  onLoadEnd(e) {
+  onLoadEnd(e: ProgressEvent<FileReader>) {
     if (e.target.readyState === this.reader.DONE) {
       this.value = e.target.result;
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/focus/focus.directive.ts b/packages/qgrid-ngx-plugins/src/lib/focus/focus.directive.ts
index 63e51fc10..ba0f43a36 100644
--- a/packages/qgrid-ngx-plugins/src/lib/focus/focus.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/focus/focus.directive.ts
@@ -12,7 +12,7 @@ import { GridError } from '@qgrid/ngx';
   selector: '[q-grid-focus]',
 })
 export class FocusDirective implements AfterViewInit {
-  @Input('q-grid-focus') selector;
+  @Input('q-grid-focus') selector: any;
   @Input('q-grid-focus-disabled') disabled = false;
 
   constructor(
diff --git a/packages/qgrid-ngx-plugins/src/lib/import/import.component.html b/packages/qgrid-ngx-plugins/src/lib/import/import.component.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/qgrid-ngx-plugins/src/lib/import/import.component.ts b/packages/qgrid-ngx-plugins/src/lib/import/import.component.ts
index 2057670d1..5f19e742c 100644
--- a/packages/qgrid-ngx-plugins/src/lib/import/import.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/import/import.component.ts
@@ -16,17 +16,17 @@ import {
   EventManager,
 } from '@qgrid/core';
 import { GridPlugin, TemplateHostService } from '@qgrid/ngx';
-import { ImportPlugin } from '@qgrid/plugins';
+import { ImportOptions, ImportPlugin } from '@qgrid/plugins';
 
 @Component({
   selector: 'q-grid-import',
-  templateUrl: './import.component.html',
+  template: '',
   providers: [TemplateHostService, GridPlugin],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ImportComponent implements AfterViewInit {
-  @Input() options: any;
-  @ContentChild(TemplateRef) templateRef: TemplateRef<any>;
+  @Input() options: ImportOptions;
+  @ContentChild(TemplateRef) templateRef: TemplateRef<unknown>;
 
   // eslint-disable-next-line no-use-before-define
   context: { $implicit: ImportComponent } = {
diff --git a/packages/qgrid-ngx-plugins/src/lib/live-cell/live-cell.component.ts b/packages/qgrid-ngx-plugins/src/lib/live-cell/live-cell.component.ts
index 745066cb2..bbb59860b 100644
--- a/packages/qgrid-ngx-plugins/src/lib/live-cell/live-cell.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/live-cell/live-cell.component.ts
@@ -24,12 +24,12 @@ export class LiveCellComponent implements OnInit, OnDestroy {
 
   @HostBinding('class') class: string;
 
-  @ViewChild('currency', { static: true }) currencyTemplate: TemplateRef<any>;
-  @ViewChild('number', { static: true }) numberTemplate: TemplateRef<any>;
-  @ViewChild('time', { static: true }) timeTemplate: TemplateRef<any>;
-  @ViewChild('text', { static: true }) textTemplate: TemplateRef<any>;
+  @ViewChild('currency', { static: true }) currencyTemplate: TemplateRef<HTMLElement>;
+  @ViewChild('number', { static: true }) numberTemplate: TemplateRef<HTMLElement>;
+  @ViewChild('time', { static: true }) timeTemplate: TemplateRef<HTMLElement>;
+  @ViewChild('text', { static: true }) textTemplate: TemplateRef<HTMLElement>;
 
-  timeoutId: any = null;
+  timeoutId: ReturnType<typeof setTimeout> = null;
 
   constructor(private zone: NgZone) {
   }
@@ -62,7 +62,7 @@ export class LiveCellComponent implements OnInit, OnDestroy {
       case 'currency':
         return +value.currentValue - +value.previousValue;
       default:
-        return null;
+        return 0;
     }
   }
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/live-column/live-column.component.ts b/packages/qgrid-ngx-plugins/src/lib/live-column/live-column.component.ts
index ec152de9f..6576b0172 100644
--- a/packages/qgrid-ngx-plugins/src/lib/live-column/live-column.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/live-column/live-column.component.ts
@@ -5,6 +5,7 @@ import {
   NgZone,
   OnInit,
 } from '@angular/core';
+import { ColumnView } from '@qgrid/core';
 import { Fastdom, GRID_PREFIX } from '@qgrid/core';
 import { GridPlugin } from '@qgrid/ngx';
 
@@ -23,7 +24,7 @@ export class LiveColumnComponent implements OnInit {
     let startPos: number;
     let endPos: number;
     const { model } = this.plugin;
-    let currentColumns: any[];
+    let currentColumns: ColumnView[];
 
     model.animation({
       apply: model.animation().apply.concat((memo, context, complete) => {
@@ -36,7 +37,7 @@ export class LiveColumnComponent implements OnInit {
         }
 
         const { columnId } = model.data();
-        const animations = [];
+        const animations: Promise<void>[] = [];
 
         startPos = currentColumns.length;
         endPos = 0;
@@ -71,7 +72,7 @@ export class LiveColumnComponent implements OnInit {
   private moveColumn(from: number, to: number, startPos: number, endPos: number) {
     const { table } = this.plugin;
 
-    return new Promise((animationEnd, animationError) => {
+    return new Promise<void>((animationEnd, animationError) => {
       const oldColumn = table.body.column(from);
       const newColumn = table.body.column(to);
       const startColumn = table.body.column(startPos);
@@ -97,10 +98,10 @@ export class LiveColumnComponent implements OnInit {
         }
 
         Fastdom.mutate(() => {
-          const animatedCells = [];
+          const animatedCells: Promise<void>[] = [];
           oldColumn.addClass(`${GRID_PREFIX}-live-column`);
           oldColumn.cells().forEach(cell => animatedCells.push(
-            new Promise(columnAnimationEnd => {
+            new Promise<void>(columnAnimationEnd => {
               const animation = cell.model().element.animate(
                 [{ transform: 'translateX(0px)' }, { transform: `translateX(${offset}px)` }],
                 { duration: this.duration },
@@ -109,11 +110,11 @@ export class LiveColumnComponent implements OnInit {
               animation.onfinish = () => Fastdom.mutate(() => {
                 oldColumn.removeClass(`${GRID_PREFIX}-live-column`);
                 oldColumn.removeClass(`${GRID_PREFIX}-drag`);
-                columnAnimationEnd(null);
+                columnAnimationEnd();
               });
             })));
 
-          Promise.all(animatedCells).finally(() => animationEnd(null));
+          Promise.all(animatedCells).finally(() => animationEnd());
         });
       });
     });
diff --git a/packages/qgrid-ngx-plugins/src/lib/live-row/live-row.component.ts b/packages/qgrid-ngx-plugins/src/lib/live-row/live-row.component.ts
index a3cdbcdd1..adf6eef47 100644
--- a/packages/qgrid-ngx-plugins/src/lib/live-row/live-row.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/live-row/live-row.component.ts
@@ -21,7 +21,7 @@ export class LiveRowComponent implements OnInit {
 
   ngOnInit() {
     const { model } = this.plugin;
-    let currentRows: any[];
+    let currentRows: unknown[];
 
     model.animation({
       apply: model.animation().apply.concat((memo, context, complete) => {
@@ -34,7 +34,7 @@ export class LiveRowComponent implements OnInit {
         }
 
         const { rowId } = model.data();
-        const animations = [];
+        const animations: Promise<void>[] = [];
 
         for (let rowIndex = 0, length = previousRows.length; rowIndex < length; rowIndex++) {
           const newRowIndex = currentRows.findIndex((row, i) => rowId(i, row) === rowId(rowIndex, previousRows[rowIndex]));
@@ -54,7 +54,7 @@ export class LiveRowComponent implements OnInit {
   }
 
   private fadeOutRow(index: number) {
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
       const tr = this.plugin.table.body.row(index);
       if (!tr.model()) {
         reject(`Can't find model for row ${index}`);
@@ -67,7 +67,7 @@ export class LiveRowComponent implements OnInit {
           { duration: this.duration },
         );
 
-        animation.onfinish = () => resolve(null);
+        animation.onfinish = () => resolve();
       });
     });
   }
@@ -75,7 +75,7 @@ export class LiveRowComponent implements OnInit {
   private moveRow(from: number, to: number) {
     const { table } = this.plugin;
 
-    return new Promise((animationEnd, animationError) => {
+    return new Promise<void>((animationEnd, animationError) => {
       const oldTr = table.body.row(from);
       const newTr = table.body.row(to);
 
@@ -89,13 +89,13 @@ export class LiveRowComponent implements OnInit {
         const offset = newTr.rect().top - oldTr.rect().top;
 
         Fastdom.mutate(() => {
-          const animatedRows = [];
+          const animatedRows: Promise<void>[] = [];
           oldTr.addClass(`${GRID_PREFIX}-live-row`);
-          (oldTr.getElement() as any)
+          (oldTr.getElement() as unknown as { elements: HTMLElement[] })
             .elements
             .forEach(rowElement =>
               animatedRows.push(
-                new Promise(animationRowEnd => {
+                new Promise<void>(animationRowEnd => {
                   const animation = rowElement.animate(
                     [{ transform: 'translateY(0px)' }, { transform: `translateY(${offset}px)` }],
                     { duration: this.duration },
@@ -104,12 +104,12 @@ export class LiveRowComponent implements OnInit {
                   animation.onfinish = () => Fastdom.mutate(() => {
                     oldTr.removeClass(`${GRID_PREFIX}-live-row`);
                     oldTr.removeClass(`${GRID_PREFIX}-drag`);
-                    animationRowEnd(null);
+                    animationRowEnd();
                   });
                 })),
             );
 
-          Promise.all(animatedRows).finally(() => animationEnd(null));
+          Promise.all(animatedRows).finally(() => animationEnd());
         });
       });
     });
diff --git a/packages/qgrid-ngx-plugins/src/lib/pane/pane.component.ts b/packages/qgrid-ngx-plugins/src/lib/pane/pane.component.ts
index 14b115d1b..13076f9d3 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pane/pane.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pane/pane.component.ts
@@ -5,12 +5,15 @@ import {
   Input,
   OnInit,
 } from '@angular/core';
-import { isUndefined } from '@qgrid/core';
-import { GridError, GridEventArg, GridPlugin, TemplateHostService } from '@qgrid/ngx';
+import { isUndefined, NotifyModel, ReadModel, Table } from '@qgrid/core';
+import { GridError, GridEvent, GridPlugin, TemplateHostService } from '@qgrid/ngx';
 
 type PaneSide = 'left' | 'right';
 const DEFAULT_SIDE: PaneSide = 'right';
 
+type PaneTriggerOn = keyof ReadModel;
+type PaneTriggerFor<K extends keyof ReadModel> = keyof ReturnType<ReadModel[K]>;
+
 @Component({
   selector: 'q-grid-pane',
   templateUrl: './pane.component.html',
@@ -24,7 +27,7 @@ export class PaneComponent implements OnInit {
     [side in PaneSide]?: {
       // eslint-disable-next-line no-use-before-define
       $implicit: PaneComponent;
-      value: any;
+      value: unknown;
     }
   };
 
@@ -52,22 +55,25 @@ export class PaneComponent implements OnInit {
     const scope = this.parse();
     if (scope) {
       const [state, prop] = scope;
-      observeReply(model[`${state}Changed`])
-        .subscribe((e: GridEventArg<any>) => {
-          if (!prop || e.hasChanges(prop)) {
-            this.open(DEFAULT_SIDE);
-          }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      observeReply(model[`${state}Changed` as keyof NotifyModel] as GridEvent<any>)
+        .subscribe({
+          next: e => {
+            if (!prop || e.hasChanges(prop)) {
+              this.open(DEFAULT_SIDE);
+            }
+          },
         });
     }
   }
 
-  open(side: PaneSide = DEFAULT_SIDE, value?: any) {
-    const { table, model } = this.plugin;
+  open(side: PaneSide = DEFAULT_SIDE, value?: unknown) {
+    const { table, model }: { table: Table; model: ReadModel } = this.plugin;
 
     const scope = this.parse();
     if (scope && isUndefined(value)) {
       const [state, prop] = scope;
-      value = model[state]()[prop];
+      value = model[state]()[prop as PaneTriggerFor<keyof ReadModel>];
     }
 
     this.context[side] = { $implicit: this, value };
@@ -98,7 +104,8 @@ export class PaneComponent implements OnInit {
 
   private parse() {
     const { model } = this.plugin;
-    const parts = this.trigger ? this.trigger.split('.') : [];
+    const parts = (this.trigger ? this.trigger.split('.') : []) as [PaneTriggerOn, PaneTriggerFor<PaneTriggerOn>];
+
     if (parts.length > 0) {
       const [state, prop] = parts;
       if (!model[state]) {
diff --git a/packages/qgrid-ngx-plugins/src/lib/persistence/persistence.component.ts b/packages/qgrid-ngx-plugins/src/lib/persistence/persistence.component.ts
index fc43ff408..a31be377a 100644
--- a/packages/qgrid-ngx-plugins/src/lib/persistence/persistence.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/persistence/persistence.component.ts
@@ -10,6 +10,7 @@ import {
   Command,
   Composite,
   filter,
+  NotifyModel,
   PersistenceSchedule,
   PersistenceService,
   PersistenceState,
@@ -107,12 +108,13 @@ export class PersistenceComponent implements OnInit, OnChanges {
         const { settings, storage, defaultGroup } = model.persistence();
         for (const state of Object.keys(settings)) {
           for (const key of settings[state]) {
-            observe(model[state + 'Changed'] as GridEvent<any>)
+            const action = state + 'Changed' as keyof NotifyModel;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            observe((model as NotifyModel)[action] as GridEvent<any>)
               .pipe(
                 // TODO: get rid of e.tag.source check
                 filter(e => e.hasChanges(key) && e.tag.source !== 'persistence.service'),
-              )
-              .subscribe(() => {
+              ).subscribe(() => {
                 const currentModel = this.service.save();
                 const item = {
                   title: `auto-save: ${state}.${key} changed`,
@@ -127,7 +129,6 @@ export class PersistenceComponent implements OnInit, OnChanges {
               });
           }
         }
-
         break;
       }
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/array.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/array.pipe.ts
index 364255b0d..b5f1265d0 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/array.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/array.pipe.ts
@@ -5,7 +5,7 @@ import { isArray, isUndefined, Log } from '@qgrid/core';
   name: 'qGridArray',
 })
 export class ArrayPipe implements PipeTransform {
-  transform(value: any) {
+  transform(value: unknown[]) {
     if (isArray(value)) {
       return value;
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/convert.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/convert.pipe.ts
index 162868c3e..117244544 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/convert.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/convert.pipe.ts
@@ -7,7 +7,7 @@ import { parseFactory } from '@qgrid/core';
 export class ConvertPipe implements PipeTransform {
   constructor() { }
 
-  transform(value: any, type: string) {
+  transform(value: unknown, type: string) {
     const parse = parseFactory(type);
     const result = parse(value);
     return result === null ? value : result;
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/currency.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/currency.pipe.ts
index 2a534e703..ce0a86734 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/currency.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/currency.pipe.ts
@@ -8,7 +8,7 @@ import { Log } from '@qgrid/core';
 export class CurrencyPipe implements PipeTransform {
   constructor(private pipe: NgCurrencyPipe) { }
 
-  transform(value: any, currencyCode?: string, display?: boolean, digitsInfo?: any, locale?: any) {
+  transform(value: string | number, currencyCode?: string, display?: boolean, digitsInfo?: string, locale?: string) {
     try {
       return this.pipe.transform(value, currencyCode, display, digitsInfo, locale);
     } catch (ex) {
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/date.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/date.pipe.ts
index 047ede927..8d5101c93 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/date.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/date.pipe.ts
@@ -8,13 +8,13 @@ import { Log } from '@qgrid/core';
 export class DatePipe implements PipeTransform {
   constructor(private pipe: NgDatePipe) { }
 
-  transform(value: any, format?: any, timezone?: any, locale?: any) {
+  transform(value: string | number | Date, format?: string, timezone?: string, locale?: string) {
     try {
       // The value expression: a Date object, a number (milliseconds since UTC epoch), or an ISO string
       return this.pipe.transform(value, format, timezone, locale);
     } catch (ex) {
       Log.warn('DatePipe', ex.message);
-      return value;
+      return value as string;
     }
   }
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/filter.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/filter.pipe.ts
index 8b2d8c0c0..b13e2070e 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/filter.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/filter.pipe.ts
@@ -5,7 +5,7 @@ import { filterNode, Node, predicateFactory } from '@qgrid/core';
   name: 'qGridFilter',
 })
 export class FilterPipe implements PipeTransform {
-  transform(items: any[] | Node, { search = null, type = 'plain' }) {
+  transform(items: unknown[] | Node, { search = null, type = 'plain' }) {
     if (search || search === 0 || search === false) {
       const predicate = predicateFactory(search);
       switch (type) {
@@ -14,7 +14,7 @@ export class FilterPipe implements PipeTransform {
           return filterNode(root, predicate);
         }
         default: {
-          return (items as any[]).filter(predicate);
+          return (items as unknown[]).filter(predicate);
         }
       }
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/item-label.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/item-label.pipe.ts
index 3cfe53024..4c4b8cc34 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/item-label.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/item-label.pipe.ts
@@ -4,9 +4,7 @@ import { PipeTransform, Pipe } from '@angular/core';
   name: 'qGridItemLabel',
 })
 export class ItemLabelPipe implements PipeTransform {
-  constructor() { }
-
-  transform(value: any, itemLabel: (x: any) => string) {
+  transform(value: unknown, itemLabel: (x: unknown) => string) {
     if (itemLabel) {
       return itemLabel(value);
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/number.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/number.pipe.ts
index f605ab5d0..8244e093e 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/number.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/number.pipe.ts
@@ -6,14 +6,16 @@ import { Log } from '@qgrid/core';
   name: 'qGridNumber',
 })
 export class NumberPipe implements PipeTransform {
-  constructor(private pipe: DecimalPipe) { }
+  constructor(
+    private pipe: DecimalPipe,
+  ) { }
 
-  transform(value: any, digitsInfo?: any, locale?: any) {
+  transform(value: string | number | unknown, digitsInfo?: string, locale?: string) {
     try {
-      return this.pipe.transform(value, digitsInfo, locale);
+      return this.pipe.transform(value as string | number, digitsInfo, locale);
     } catch (ex) {
       Log.warn('NumberPipe', ex.message);
-      return value;
+      return value as string;
     }
   }
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/pipes/time.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/pipes/time.pipe.ts
index 93bda669c..430fa189f 100644
--- a/packages/qgrid-ngx-plugins/src/lib/pipes/time.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/pipes/time.pipe.ts
@@ -8,7 +8,7 @@ import { Log } from '@qgrid/core';
 export class TimePipe implements PipeTransform {
   constructor(private pipe: DatePipe) { }
 
-  transform(value: any, format?: any, timezone?: any, locale?: any) {
+  transform(value: string | number | Date, format?: string, timezone?: string, locale?: string) {
     try {
       return this.pipe.transform(value, format, timezone, locale);
     } catch (ex) {
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder-panel.component.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder-panel.component.ts
index 7c1698072..1cb8d20d1 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder-panel.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder-panel.component.ts
@@ -18,10 +18,10 @@ import { WhereSchema } from './schema/where.schema';
   providers: [FocusAfterRender, GridPlugin],
 })
 export class QueryBuilderPanelComponent implements OnInit {
-  private traverse = new TraverseService();
+  private traverse = new TraverseService<boolean>();
   private plan: INodeSchema;
 
-  @Output() close = new EventEmitter<any>();
+  @Output() close = new EventEmitter<void>();
 
   node: Node;
   queryService: QueryBuilderService;
@@ -35,7 +35,7 @@ export class QueryBuilderPanelComponent implements OnInit {
     execute: () => {
       const current = this.nodeService.current;
       const parent = this.findLogicalNode(current);
-      const group = parent.clone();
+      const group = parent?.clone();
       parent.addChildAfter(group, current.id === '#condition' && current);
       if (current.id === '#condition') {
         this.nodeService.current = group;
@@ -49,7 +49,7 @@ export class QueryBuilderPanelComponent implements OnInit {
       const current = this.nodeService.current;
       const parent = this.findLogicalNode(current);
       const rule = this.plan.materialize('#condition');
-      parent.addChildAfter(rule, current.id === '#condition' && current);
+      parent?.addChildAfter(rule, current.id === '#condition' && current);
       if (current.id === '#condition') {
         this.nodeService.current = rule;
       }
@@ -65,12 +65,12 @@ export class QueryBuilderPanelComponent implements OnInit {
       } else {
         const previous = this.traverse.findUpSibling(current);
         this.nodeService.current = previous;
-        current.remove();
+        current?.remove();
       }
     },
     canExecute: () => {
       const current = this.nodeService.current;
-      return current && (current.id === '#condition' || (current.level > 1 || current.children.length > 0));
+      return !!current && (current.id === '#condition' || (current.level > 1 || current.children.length > 0));
     },
   });
 
@@ -96,7 +96,7 @@ export class QueryBuilderPanelComponent implements OnInit {
         (memo, expression, line, node) =>
           node.attr('placeholder')
             ? memo
-            : memo && expression.isValid()
+            : memo && !!expression.isValid?.()
         , true);
     },
   });
@@ -134,6 +134,7 @@ export class QueryBuilderPanelComponent implements OnInit {
     this.queryService = new QueryBuilderService(this.plugin.model);
 
     const schema = new WhereSchema(this.queryService);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     this.plan = schema.factory() as any;
     this.node = this.plan.apply();
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.model.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.model.ts
index 387209a93..420d0abbf 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.model.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.model.ts
@@ -1,5 +1,5 @@
 import { ISerializationNode } from '../expression-builder/serialization.service';
 
 export class QueryBuilderModel {
-  node: ISerializationNode = null;
+  node: ISerializationNode | null = null;
 }
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.pipe.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.pipe.ts
index d97ea16ef..6d410cd18 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.pipe.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.pipe.ts
@@ -13,8 +13,8 @@ import { Validator } from './schema/validator';
 export class QueryBuilderPipe implements PipeTransform {
   visitor: MarkupVisitor;
 
-  transform(value: any, service: QueryBuilderService): any {
-    const node = value as Node;
+  transform(value: Node, service: QueryBuilderService): string {
+    const node = value;
     if (node) {
       if (!this.visitor) {
         const validator = new Validator(service);
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.service.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.service.ts
index 8bbd5f849..69dfd19a3 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.service.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/query-builder.service.ts
@@ -1,40 +1,60 @@
 import * as columnService from '@qgrid/core';
 import { getValueFactory, isUndefined, uniq } from '@qgrid/core';
 import { GridError, GridModel } from '@qgrid/ngx';
+import { Expression } from '../expression-builder/model/expression';
 import { ExpressionBuilder } from '../expression-builder/model/expression.builder';
+import { Line } from '../expression-builder/model/line';
 import { Node } from '../expression-builder/model/node';
 import { typeMapping } from './schema/operator';
 
 export interface Column {
-	key: string; title: string; type: string;
+  key: string;
+  title: string;
+  type: string;
 }
 
 export interface ColumnMap {
-	[key: string]: Column;
+  [key: string]: Column;
+}
+
+type AcceptableValues = string | string[] | Promise<string[]> | boolean;
+
+type QueryBuilderSetting =
+  AcceptableValues |
+  { [key: string]: boolean | ((node?: Node) => boolean) } |
+  ((node?: Node, line?: Line, key?: string) => AcceptableValues | void);
+
+export interface QueryBuilderSettings {
+  [key: string]: QueryBuilderSetting;
+}
+
+interface QueryBuilderSchemaAttributes {
+  [key: string]: boolean | string[] | ((node: Node) => boolean);
 }
 
 export interface IQueryBuilderSchema {
-	apply(node?: Node): Node;
-	attr(key: string, value: any): IQueryBuilderSchema;
-	node(id: string, build: (schema: IQueryBuilderSchema) => void): IQueryBuilderSchema;
-	group(id: string, build: (schema: IQueryBuilderSchema) => void): IQueryBuilderSchema;
-	get(id: string): IQueryBuilderSchema;
-	materialize(id: string): Node;
-
-	autocomplete(id: string, settings?: any): IQueryBuilderSchema;
-	button(id: string, settings?: any): IQueryBuilderSchema;
-	input(id: string, settings?: any): IQueryBuilderSchema;
-	iconButton(id: string, settings?: any): IQueryBuilderSchema;
-	label(id: string, settings?: any): IQueryBuilderSchema;
-	multiselect(id: string, settings?: any): IQueryBuilderSchema;
-	select(id: string, settings?: any): IQueryBuilderSchema;
+  apply(node?: Node): Node;
+  attr(key: string, value: QueryBuilderSchemaAttributes): IQueryBuilderSchema;
+  node(id: string, build: (schema: IQueryBuilderSchema) => void): IQueryBuilderSchema;
+  group(id: string, build: (schema: IQueryBuilderSchema) => void): IQueryBuilderSchema;
+  get(id: string): IQueryBuilderSchema;
+  materialize(id: string): Node;
+
+  autocomplete(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
+  button(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
+  input(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
+  iconButton(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
+  label(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
+  multiselect(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
+  select(id: string, settings?: QueryBuilderSettings): IQueryBuilderSchema;
 }
 
 export class QueryBuilderService {
-  constructor(private model: GridModel) {
-  }
+  constructor(
+    private model: GridModel,
+  ) { }
 
-  columns(): Array<Column> {
+  columns(): Column[] {
     const model = this.model;
     return model
       .columnList()
@@ -49,12 +69,12 @@ export class QueryBuilderService {
 
   columnMap(): ColumnMap {
     return this.columns().reduce((memo, column) => {
-      memo[column.key] = column;
+      memo[column.key as keyof ColumnMap] = column;
       return memo;
-    }, {});
+    }, {} as ColumnMap);
   }
 
-  submit(expression) {
+  submit(expression: Expression) {
     const model = this.model;
     model.filter({
       by: expression,
@@ -63,7 +83,7 @@ export class QueryBuilderService {
     });
   }
 
-  suggest(key, skip, take, search, selection?: Array<string>): Promise<string[]> {
+  suggest(key: string, skip: number, take: number, search: string, selection?: string[]): Promise<string[]> {
     selection = (selection || []).map(item => ('' + item).toLowerCase());
 
     const model = this.model;
@@ -81,9 +101,9 @@ export class QueryBuilderService {
         .map(getValue)
         .filter(item =>
           !isUndefined(item) &&
-					item !== '' &&
-					item !== null &&
-					selection.indexOf(('' + item).toLowerCase()) < 0,
+          item !== '' &&
+          item !== null &&
+          selection.indexOf(('' + item).toLowerCase()) < 0,
         );
 
       const uniqueView = uniq(view);
@@ -133,7 +153,7 @@ export class QueryBuilderService {
 
     const settings = {
       defaults: {
-        isValid: function () {
+        isValid: function (this: { validate: () => string[]; state: string[] }) {
           return !this.validate || !(this.state = this.validate()).length;
         },
       },
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/converter.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/converter.ts
index 50bee90b7..3ec5691ad 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/converter.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/converter.ts
@@ -1,8 +1,10 @@
-import { cloneDeep } from '@qgrid/core';
+import { cloneDeep, Expression } from '@qgrid/core';
 import { GridError } from '@qgrid/ngx';
+
+import { ISerializationGroup, ISerializationNode } from '../../expression-builder/serialization.service';
 import { camelCaseMapping } from './operator';
 
-export function visit(item) {
+export function visit(item: ISerializationNode): Expression {
   switch (item.id) {
     case '#root':
       return visit(item.children[0]);
@@ -23,7 +25,7 @@ export function visit(item) {
   }
 }
 
-function visitGroup(node) {
+function visitGroup(node: ISerializationNode): Expression {
   const line = node.line;
   const opExpr = find(line, '#logical-op', '#logical-op');
   const children = node.children.filter(notPlaceholder).map(visit);
@@ -51,16 +53,16 @@ function visitGroup(node) {
     }), children[0]);
 }
 
-function visitCondition(node) {
+function visitCondition(node: ISerializationNode) {
   const line = node.line;
   const opExpr = find(line, '#operator', '#operator');
   const value = opExpr.value.toUpperCase();
 
-  let condition;
+  let condition: Expression = { kind: 'condition' } as Expression;
   switch (value) {
     case 'IS NOT EMPTY':
     case 'IS EMPTY':
-      condition = visitUnary(line, opExpr.value);
+      condition = { ...condition, ...visitUnary(line, opExpr.value) };
       break;
     case 'EQUALS':
     case 'NOT EQUALS':
@@ -72,43 +74,41 @@ function visitCondition(node) {
     case 'NOT LIKE':
     case 'STARTS WITH':
     case 'ENDS WITH':
-      condition = visitBinary(line, opExpr.value);
+      condition = { ...condition, ...visitBinary(line, opExpr.value) };
       break;
     case 'BETWEEN':
-      condition = visitBetween(line);
+      condition = { ...condition, ...visitBetween(line) };
       break;
     case 'IN':
-      condition = visitIn(line);
+      condition = { ...condition, ...visitIn(line) };
       break;
     default:
       throw new GridError('converter', `Invalid operation ${value}`);
   }
-
-  condition.kind = 'condition';
   return condition;
 }
 
-function visitUnary(line, op) {
+function visitUnary(line: ISerializationGroup[], op: string): Omit<Expression, 'right' | 'kind'> {
   const left = visitField(line);
 
   return {
     left: left.value,
-    op: camelCaseMapping[op.toUpperCase()],
+    op: camelCaseMapping[op.toUpperCase() as keyof typeof camelCaseMapping],
   };
 }
 
-function visitBinary(line, op) {
+function visitBinary(line: ISerializationGroup[], op: string): Omit<Expression, 'kind'> {
   const left = visitField(line);
   const right = find(line, '#operand', '#value') || find(line, '#fieldRight');
 
   return {
     left: left.value,
-    op: camelCaseMapping[op.toUpperCase()],
+    op: camelCaseMapping[(op.toUpperCase() as keyof typeof camelCaseMapping)],
     right: right.value,
   };
 }
 
-function visitIn(line) {
+function visitIn(line: ISerializationGroup[]): Omit<Expression, 'kind'> {
   const left = visitField(line);
   const right = find(line, '#operand', '#in-operand') || find(line, '#fieldRight');
 
@@ -119,7 +119,7 @@ function visitIn(line) {
   };
 }
 
-function visitBetween(line) {
+function visitBetween(line: ISerializationGroup[]): Omit<Expression, 'kind'> {
   const left = visitField(line);
   const from = find(line, '#operand', '#from') || find(line, '#fieldFrom');
   const to = find(line, '#operand', '#to') || find(line, '#fieldTo');
@@ -131,15 +131,15 @@ function visitBetween(line) {
   };
 }
 
-function visitField(line) {
+function visitField(line: ISerializationGroup[]) {
   return find(line, '#field') || find(line, '#fieldLeft');
 }
 
-function notPlaceholder(node) {
+function notPlaceholder(node: ISerializationNode) {
   return !node.attributes.placeholder;
 }
 
-function find(line, groupId: string, exprId?: string) {
+function find(line: ISerializationGroup[], groupId: string, exprId?: string) {
   const group = findById(line, groupId);
   if (!group) {
     return null;
@@ -148,7 +148,7 @@ function find(line, groupId: string, exprId?: string) {
   return findById(group.expressions, exprId || groupId);
 }
 
-function findById(items, id: string) {
+function findById<T extends { id: string }>(items: T[], id: string) {
   const result = items.filter(item => item.id === id);
   const length = result.length;
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/operator.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/operator.ts
index e9573fa92..8e7d11fe2 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/operator.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/operator.ts
@@ -1,5 +1,9 @@
-function swap(inst: { [key: string]: string }): { [key: string]: string } {
-  const result = {};
+type Swap<T extends { [key: string]: string }> = {
+  [key in T[keyof T]as string]: keyof T;
+};
+
+function swap<T extends { [key: string]: string }>(inst: T): Swap<T> {
+  const result = {} as Swap<T>;
   for (const prop in inst) {
     if (Object.prototype.hasOwnProperty.call(inst, prop)) {
       result[inst[prop]] = prop;
diff --git a/packages/qgrid-ngx-plugins/src/lib/export/export.component.html b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/optq.ts
similarity index 100%
rename from packages/qgrid-ngx-plugins/src/lib/export/export.component.html
rename to packages/qgrid-ngx-plugins/src/lib/query-builder/schema/optq.ts
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/suggest.service.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/suggest.service.ts
index d9f23134f..a6c4fab31 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/suggest.service.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/suggest.service.ts
@@ -1,7 +1,9 @@
+import { Line } from '../../expression-builder/model/line';
+import { Node } from '../../expression-builder/model/node';
 import { QueryBuilderService } from '../query-builder.service';
 
 export function suggestFactory(service: QueryBuilderService, name: string) {
-  return function (node, line) {
+  return function (this: { value: string }, node: Node, line: Line) {
     const search = (this.value || '').toLowerCase();
     const field = line.get(name).expressions[0].value;
     return service.suggest(field, 0, 10, search);
@@ -9,14 +11,14 @@ export function suggestFactory(service: QueryBuilderService, name: string) {
 }
 
 export function suggestsFactory(service: QueryBuilderService, name: string) {
-  return function (node, line) {
+  return function (this: { search: string; values: string[] }, node: Node, line: Line) {
     const search = this.search;
     const field = line.get(name).expressions[0].value;
-    const selection =
+    const selection: string[] =
       (this.values || [])
         .map(item => ('' + item).toLowerCase());
 
-    return new Promise((resolve, reject) =>
+    return new Promise<string[]>((resolve, reject) =>
       service
         .suggest(field, 0, 10, search, selection)
         .then(items => {
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/validator.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/validator.ts
index 8830cbe9f..58ddf58f9 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/validator.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/validator.ts
@@ -2,25 +2,27 @@ import { createValidator, isArray } from '@qgrid/core';
 import { GridError } from '@qgrid/ngx';
 import { ColumnMap, QueryBuilderService } from '../query-builder.service';
 
+const rules = {
+  'bool': ['required'],
+  'currency': ['required', 'decimal'],
+  'date': ['required', 'iso_date'],
+  'email': ['required'],
+  'file': ['required'],
+  'id': ['required'],
+  'image': ['required'],
+  'number': ['required', 'decimal'],
+  'password': ['required'],
+  'url': ['required'],
+  'reference': ['required'],
+  'text': ['required', 'string'],
+  'time': ['required'],
+};
+
 export class Validator {
   private columnMap: ColumnMap;
-  private trueResult: Array<string> = [];
-  private validators: { [key: string]: (value: any) => Array<string> } = {};
-  private rules = {
-    'bool': ['required'],
-    'currency': ['required', 'decimal'],
-    'date': ['required', 'iso_date'],
-    'email': ['required'],
-    'file': ['required'],
-    'id': ['required'],
-    'image': ['required'],
-    'number': ['required', 'decimal'],
-    'password': ['required'],
-    'url': ['required'],
-    'reference': ['required'],
-    'text': ['required', 'string'],
-    'time': ['required'],
-  };
+  private trueResult: string[] = [];
+  private validators: { [key: string]: (value: string | string[]) => string[] } = {};
+  private rules = rules;
 
   constructor(service: QueryBuilderService) {
     this.columnMap = service.columnMap();
@@ -38,12 +40,12 @@ export class Validator {
     }
 
     const trueResult = this.trueResult;
-    const id = column.type;
+    const id = column.type as keyof typeof rules;
     const rule = this.rules[id];
-    let validate: ((value: any) => string[]) = () => trueResult;
+    let validate: ((value: string | string[]) => string[]) = () => trueResult;
     if (rule) {
       const schema = { [id]: rule };
-      validate = function test(value): Array<string> {
+      validate = function test(value): string[] {
         if (isArray(value)) {
           const result = [];
           for (const item of value) {
@@ -61,7 +63,7 @@ export class Validator {
         }
 
         const error = validator.getErrors()[id];
-        return isArray(error) ? error : [error];
+        return isArray(error) ? error as string[] : [error as string];
       };
     }
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/where.schema.ts b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/where.schema.ts
index f332582bd..c4399f7e9 100644
--- a/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/where.schema.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/query-builder/schema/where.schema.ts
@@ -1,22 +1,25 @@
 import { isArray, noop } from '@qgrid/core';
-import { IQueryBuilderSchema, QueryBuilderService } from '../query-builder.service';
+import { Expression, GroupExpression } from '../../expression-builder/model/expression';
+import { Line } from '../../expression-builder/model/line';
+import { Node } from '../../expression-builder/model/node';
+import { IQueryBuilderSchema, QueryBuilderService, QueryBuilderSettings } from '../query-builder.service';
 import { typeMapping } from './operator';
 import { suggestFactory, suggestsFactory } from './suggest.service';
 import { Validator } from './validator';
 
-export const getValue = (line, id, props) => {
-  const group = line.get(id);
+export const getValue = (line: Line, id: string, props: string[]): string => {
+  const group = line.get(id) as GroupExpression;
   if (group) {
     if (group.expressions.length === 1) {
       const expr = group.expressions[0];
       const prop = props.filter(p => Object.prototype.hasOwnProperty.call(expr, p))[0];
       if (prop) {
-        const value = expr[prop];
-        if (isArray(value) && value.length) {
-          return value[0];
+        const value = expr[prop as keyof Expression];
+        if (isArray(value) && (value as string[]).length) {
+          return (value as string[])[0];
         }
 
-        return value;
+        return value as string;
       }
     }
   }
@@ -25,16 +28,41 @@ export const getValue = (line, id, props) => {
 };
 
 export class WhereSchema {
-  constructor(private service: QueryBuilderService) {
-  }
+  constructor(
+    private service: QueryBuilderService,
+  ) { }
 
-  factory(): IQueryBuilderSchema {
+  factory() {
     const service = this.service;
     const suggest = suggestFactory(service, '#field');
     const suggests = suggestsFactory(service, '#field');
     const validator = new Validator(service);
 
-    return this.service.build()
+    const hasValue = function (this: QueryBuilderSettings) {
+      return !!(this.value as string);
+    };
+
+    const isValid = function (this: QueryBuilderSettings & { isValid: (nd: Node) => boolean }, n: Node) {
+      return !this.isValid(n);
+    };
+
+    const validate = function (line: Line) {
+      return function (this: QueryBuilderSettings) {
+        const field = line.get('#field').expressions[0].value;
+        return validator.for(field)(this.value as string);
+      };
+    };
+
+    const refresh = function (
+      this: QueryBuilderSettings & { suggest: (nn: Node, ll: Line) => Promise<string[]> },
+      n: Node,
+      l: Line,
+    ) {
+      this.options = this.suggest(n, l);
+    };
+
+    return this.service
+      .build()
       .node('#logical', function (logical) {
         logical
           .attr('serialize', {
@@ -42,7 +70,7 @@ export class WhereSchema {
           })
           .attr('class', {
             'qb-logical': true,
-            'qb-and': function (node) {
+            'qb-and': function (node: Node) {
               const op = node.line.get('#logical-op');
               return op.expressions[0].value === 'AND';
             },
@@ -78,17 +106,17 @@ export class WhereSchema {
                   const column = service.columns().filter(c => c.key === key)[0];
                   return (column && column.type) || null;
                 },
-                change: function (node, line) {
-                  const field = this.value;
-                  const type = this.getType(field);
+                change: function (this: QueryBuilderSettings & { getType: (f: string) => string }, node, line) {
+                  const field = this.value as string;
+                  const type = this.getType(field) as keyof typeof typeMapping;
                   const ops = typeMapping[type] || [];
                   const op = line.get('#operator').expressions[0];
 
                   if (ops.indexOf(op.value) < 0) {
                     op.value = ops.length ? ops[0] : null;
-                    op.change();
+                    (op as Expression & { change: () => void }).change();
                   } else {
-                    const operand = line.get('#operand').expressions[0];
+                    const operand = line.get('#operand').expressions[0] as (Expression & { validate: () => string[] });
                     if (operand.validate) {
                       const result = operand.validate();
                       if (result.length) {
@@ -102,16 +130,16 @@ export class WhereSchema {
               })
               .select('#operator', {
                 classes: ['qb-operator'],
-                getOptions: function (node, line) {
-                  const field = line.get('#field').expressions[0];
+                getOptions: function (node: Node, line: Line) {
+                  const field: Expression = line.get('#field').expressions[0];
                   const name = field.value;
-                  const type = field.getType(name);
+                  const type = (field as (Expression & { getType: (n: string) => keyof typeof typeMapping })).getType(name);
 
                   return type ? typeMapping[type] : [];
                 },
                 value: 'EQUALS',
-                change: function (node, line) {
-                  switch (this.value.toLowerCase()) {
+                change: function (this: QueryBuilderSettings, node: Node, line: Line) {
+                  switch ((this.value as string).toLowerCase()) {
                     case 'equals':
                     case 'not equals':
                     case 'greater than':
@@ -122,48 +150,32 @@ export class WhereSchema {
                     case 'not like':
                     case 'starts with':
                     case 'ends with':
-                      line.put('#operand', node, function (schema) {
+                      line.put<IQueryBuilderSchema>('#operand', node, function (schema) {
                         schema.input('#value', {
                           classes: {
                             'qb-operand': true,
-                            'qb-has-value': function () {
-                              return !!this.value;
-                            },
-                            'qb-invalid': function (n) {
-                              return !this.isValid(n);
-                            },
+                            'qb-has-value': hasValue,
+                            'qb-invalid': isValid,
                           },
                           value: getValue(line, '#operand', ['value', 'values']),
-                          validate: function () {
-                            const field = line.get('#field').expressions[0].value;
-                            return validator.for(field)(this.value);
-                          },
+                          validate: validate(line),
                           placeholderText: 'Select value',
                           suggest: suggest,
                           options: null,
-                          refresh: function (n, l) {
-                            this.options = this.suggest(n, l);
-                          },
+                          refresh: refresh,
                         });
                       });
                       break;
                     case 'between':
-                      line.put('#operand', node, function (operand) {
+                      line.put<IQueryBuilderSchema>('#operand', node, function (operand) {
                         operand
                           .input('#from', {
                             classes: {
                               'qb-operand': true,
-                              'qb-has-value': function () {
-                                return !!this.value;
-                              },
-                              'qb-invalid': function (n) {
-                                return !this.isValid(n);
-                              },
-                            },
-                            validate: function () {
-                              const field = line.get('#field').expressions[0].value;
-                              return validator.for(field)(this.value);
+                              'qb-has-value': hasValue,
+                              'qb-invalid': isValid,
                             },
+                            validate: validate(line),
                             options: suggest,
                             value: null,
                             placeholderText: 'Select value',
@@ -175,29 +187,20 @@ export class WhereSchema {
                           .input('#to', {
                             classes: {
                               'qb-operand': true,
-                              'qb-has-value': function () {
-                                return !!this.value;
-                              },
-                              'qb-invalid': function (n) {
-                                return !this.isValid(n);
-                              },
+                              'qb-has-value': hasValue,
+                              'qb-invalid': isValid,
                             },
                             value: null,
-                            validate: function () {
-                              const field = line.get('#field').expressions[0].value;
-                              return validator.for(field)(this.value);
-                            },
+                            validate: validate(line),
                             placeholderText: 'Select value',
                             suggest: suggest,
                             options: null,
-                            refresh: function (n, l) {
-                              this.options = this.suggest(n, l);
-                            },
+                            refresh: refresh,
                           });
                       });
                       break;
                     case 'in':
-                      line.put('#operand', node, function (schema) {
+                      line.put('#operand', node, function (schema: IQueryBuilderSchema) {
                         schema
                           .label('#in-open', {
                             text: '(',
@@ -205,23 +208,21 @@ export class WhereSchema {
                           .multiselect('#in-operand', {
                             classes: {
                               'qb-operand': true,
-                              'qb-has-value': function () {
-                                return !!this.values.length;
-                              },
-                              'qb-invalid': function (n) {
-                                return !this.isValid(n);
+                              'qb-has-value': function (this: QueryBuilderSettings) {
+                                return !!(this.values as string[]).length;
                               },
+                              'qb-invalid': isValid,
                             },
-                            validate: function () {
+                            validate: function (this: QueryBuilderSettings) {
                               const field = line.get('#field').expressions[0].value;
-                              return validator.for(field)(this.values);
+                              return validator.for(field)(this.values as string[]);
                             },
                             values: [],
                             options: suggests,
                             placeholderText: 'Select value',
-                            add: function (n, l, v) {
-                              if (v && this.values.indexOf(v) < 0) {
-                                this.values.push(v);
+                            add: function (this: QueryBuilderSettings, n, l, v) {
+                              if (v && (this.values as string[]).indexOf(v) < 0) {
+                                (this.values as string[]).push(v);
                               }
                             },
                           })
@@ -237,28 +238,22 @@ export class WhereSchema {
                   }
                 },
               })
-              .group('#operand', function (schema) {
+              .group('#operand', function (schema: IQueryBuilderSchema) {
                 schema.autocomplete('#value', {
                   classes: {
                     'qb-operand': true,
-                    'qb-has-value': function () {
-                      return !!this.value;
-                    },
-                    'qb-invalid': function (node) {
-                      return !this.isValid(node);
-                    },
+                    'qb-has-value': hasValue,
+                    'qb-invalid': isValid,
                   },
                   value: null,
-                  validate: function (node, line) {
+                  validate: function (this: QueryBuilderSettings, node: Node, line: Line) {
                     const field = line.get('#field').expressions[0].value;
-                    return validator.for(field)(this.value);
+                    return validator.for(field)(this.value as string);
                   },
                   placeholderText: 'Select value',
                   suggest: suggest,
                   options: null,
-                  refresh: function (node, line) {
-                    this.options = this.suggest(node, line);
-                  },
+                  refresh: refresh,
                 });
               });
           });
diff --git a/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference-editor.component.ts b/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference-editor.component.ts
index f68917be1..32fe38693 100644
--- a/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference-editor.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference-editor.component.ts
@@ -15,10 +15,10 @@ import { Disposable, GridModel } from '@qgrid/ngx';
   providers: [Disposable],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ReferenceEditorComponent implements AfterViewInit {
-  private state: any;
+export class ReferenceEditorComponent<T> implements AfterViewInit {
+  private state: T;
 
-  @Output() valueChange = new EventEmitter<any>();
+  @Output() valueChange = new EventEmitter<T>();
   @Output() afterSubmit = new EventEmitter();
   @Output() afterCancel = new EventEmitter();
 
@@ -29,7 +29,7 @@ export class ReferenceEditorComponent implements AfterViewInit {
   model: GridModel;
 
   // eslint-disable-next-line no-use-before-define
-  context: { $implicit: ReferenceEditorComponent } = {
+  context: { $implicit: ReferenceEditorComponent<T> } = {
     $implicit: this,
   };
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference.component.ts b/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference.component.ts
index 8aa89208d..64c43b60a 100644
--- a/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/reference-editor/reference.component.ts
@@ -22,25 +22,25 @@ import { Disposable, GridModel, GridModelBuilder } from '@qgrid/ngx';
   providers: [Disposable],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ReferenceComponent implements OnInit {
-  private _value: any;
+export class ReferenceComponent<T> implements OnInit {
+  private _value: T | T[];
   private _model: GridModel;
   private _reference: {
     commit: Command;
     cancel: Command;
-    value: any;
+    value: T | T[];
   };
 
   @Output() modelChange = new EventEmitter<GridModel>();
-  @Output() valueChange = new EventEmitter<any>();
-  @Output() referenceChange = new EventEmitter<{ commit: Command; cancel: Command; value: any }>();
+  @Output() valueChange = new EventEmitter<T | T[]>();
+  @Output() referenceChange = new EventEmitter<{ commit: Command; cancel: Command; value: T | T[] }>();
 
   @Input() caption = '';
   @Input() autofocus = false;
   @Input() cell: CellView;
 
   // eslint-disable-next-line no-use-before-define
-  context: { $implicit: ReferenceComponent } = {
+  context: { $implicit: ReferenceComponent<T> } = {
     $implicit: this,
   };
 
@@ -81,13 +81,13 @@ export class ReferenceComponent implements OnInit {
       value: this.value,
     };
 
-    this.model = this.cell.column.editorOptions.modelFactory({
+    this.model = this.cell.column.editorOptions?.modelFactory?.({
       reference: this.reference,
       row: this.cell.row,
       column: this.cell.column,
       getValue: getValueFactory(this.cell.column),
       createDefaultModel: () => this.modelBuilder.build(),
-    } as any);
+    }) || this.modelBuilder.build();
 
     const selectionService = new SelectionService(this.model);
     this.disposable.add(
@@ -99,7 +99,7 @@ export class ReferenceComponent implements OnInit {
             const { value } = this.reference;
             if (!isUndefined(value)) {
               const entries = isArray(value) ? value : [value];
-              const items = selectionService.map(entries);
+              const items = selectionService.map(entries as T[]);
               this.model.selection({
                 items,
               }, {
diff --git a/packages/qgrid-ngx-plugins/src/lib/rest/rest.component.ts b/packages/qgrid-ngx-plugins/src/lib/rest/rest.component.ts
index abfb2c386..3a4d05dac 100644
--- a/packages/qgrid-ngx-plugins/src/lib/rest/rest.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/rest/rest.component.ts
@@ -1,4 +1,4 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -6,8 +6,8 @@ import {
   OnChanges,
   OnInit,
 } from '@angular/core';
-import { RestState } from '@qgrid/core';
-import { GridPlugin, StateAccessor } from '@qgrid/ngx';
+import { RestSerialized, RestState } from '@qgrid/core';
+import { GridModel, GridPlugin, StateAccessor } from '@qgrid/ngx';
 import { RestPlugin } from '@qgrid/plugins';
 
 @Component({
@@ -23,7 +23,7 @@ export class RestComponent implements OnInit, OnChanges {
 
   @Input('url') set restUrl(url: string) { this.restState({ url }); }
   @Input('method') set restMethod(method: string) { this.restState({ method }); }
-  @Input('serialize') set restSerialize(serialize: (x: any) => any) { this.restState({ serialize }); }
+  @Input('serialize') set restSerialize(serialize: (x: GridModel) => RestSerialized) { this.restState({ serialize }); }
 
   constructor(
     private http: HttpClient,
@@ -41,8 +41,10 @@ export class RestComponent implements OnInit, OnChanges {
     const rest = new RestPlugin(
       this.plugin.model,
       {
-        get: (url, params) => this.http.get(url, { params }).toPromise(),
-        post: (url, data) => this.http.post(url, { data }).toPromise(),
+        get: (url: string, params: HttpParams | {
+          [param: string]: string | number | boolean | ReadonlyArray<string | number | boolean>;
+        }) => this.http.get(url, { params }).toPromise(),
+        post: (url: string, data: unknown) => this.http.post(url, { data }).toPromise(),
       },
     );
 
diff --git a/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap-in.directive.ts b/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap-in.directive.ts
index eb12056b9..5b04c0929 100644
--- a/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap-in.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap-in.directive.ts
@@ -1,15 +1,17 @@
 import { Directive, ElementRef, Input, OnInit } from '@angular/core';
 import { EventListener, EventManager } from '@qgrid/core';
-import { TabTrapComponent } from './tab-trap.component';
+import { TabTrapComponent, TrapTarget } from './tab-trap.component';
 
 @Directive({
   selector: '[q-grid-tab-trap-in]',
 })
 export class TabTrapInDirective implements OnInit {
-  @Input('q-grid-tab-trap-in') target;
+  @Input('q-grid-tab-trap-in') target: TrapTarget;
   @Input('q-grid-tab-trap-host') host: TabTrapComponent;
 
-  constructor(private elementRef: ElementRef) {
+  constructor(
+    private elementRef: ElementRef,
+  ) {
     elementRef.nativeElement.tabIndex = 0;
 
     const listener = new EventListener(elementRef.nativeElement, new EventManager(this));
diff --git a/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap.component.ts b/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap.component.ts
index 94f074bfc..435a0e62e 100644
--- a/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/tab-trap/tab-trap.component.ts
@@ -8,6 +8,9 @@ import {
 } from '@angular/core';
 import { EventListener, EventManager, Shortcut } from '@qgrid/core';
 import { GridError, GridPlugin } from '@qgrid/ngx';
+import { TabTrapInDirective } from './tab-trap-in.directive';
+
+export type TrapTarget = 'start' | 'end';
 
 @Component({
   selector: 'q-grid-tab-trap',
@@ -18,7 +21,7 @@ import { GridError, GridPlugin } from '@qgrid/ngx';
 export class TabTrapComponent {
   private isActivating = false;
 
-  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<any>;
+  @ViewChild(TemplateRef, { static: true }) template: TemplateRef<unknown>;
   @Input() roundTrip = false;
 
   // eslint-disable-next-line no-use-before-define
@@ -26,9 +29,12 @@ export class TabTrapComponent {
     $implicit: this,
   };
 
-  traps = new Map<string, any>();
+  traps = new Map<TrapTarget, TabTrapInDirective>();
 
-  constructor(private plugin: GridPlugin, elementRef: ElementRef) {
+  constructor(
+    private plugin: GridPlugin,
+    elementRef: ElementRef,
+  ) {
     const listener = new EventListener(elementRef.nativeElement, new EventManager(this));
     listener.on('keydown', e => {
       const code = Shortcut.translate(e);
@@ -38,7 +44,7 @@ export class TabTrapComponent {
     });
   }
 
-  activate(target) {
+  activate(target: TrapTarget) {
     if (this.isActivating) {
       return;
     }
@@ -55,7 +61,7 @@ export class TabTrapComponent {
     }
   }
 
-  exit(target) {
+  exit(target: TrapTarget) {
     const e = {
       key: 'Tab',
       keyCode: 9,
@@ -67,16 +73,16 @@ export class TabTrapComponent {
     shortcut.keyDown(e, 'tab-trap');
   }
 
-  goRound(target) {
+  goRound(target: TrapTarget) {
     switch (target) {
       case 'start': {
         const end = this.traps.get('end');
-        end.focus();
+        end?.focus();
         break;
       }
       case 'end': {
         const start = this.traps.get('start');
-        start.focus();
+        start?.focus();
         break;
       }
       default:
diff --git a/packages/qgrid-ngx-plugins/src/lib/time/time.directive.ts b/packages/qgrid-ngx-plugins/src/lib/time/time.directive.ts
index b85de802a..2aaa58d5d 100644
--- a/packages/qgrid-ngx-plugins/src/lib/time/time.directive.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/time/time.directive.ts
@@ -7,11 +7,14 @@ import { parseFactory } from '@qgrid/core';
 export class TimeDirective {
   private toMidnight: (x: Date | string) => Date = parseFactory('date');
 
-  constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
+  constructor(
+    templateRef: TemplateRef<unknown>,
+    viewContainerRef: ViewContainerRef,
+  ) {
     viewContainerRef.createEmbeddedView(templateRef, { $implicit: this });
   }
 
-  time(previous, current) {
+  time(previous: string | Date, current: string) {
     if (!previous) {
       previous = new Date();
     }
diff --git a/packages/qgrid-ngx-plugins/src/lib/validation/rule.component.ts b/packages/qgrid-ngx-plugins/src/lib/validation/rule.component.ts
index f4ace9bef..051b71cfc 100644
--- a/packages/qgrid-ngx-plugins/src/lib/validation/rule.component.ts
+++ b/packages/qgrid-ngx-plugins/src/lib/validation/rule.component.ts
@@ -50,7 +50,7 @@ export class RuleComponent implements OnChanges {
   @Input('equalToField') equal_to_field: string;
   @Input('listOf') list_of: string[];
 
-  @ViewChild(TemplateRef, { static: true }) templateRef: TemplateRef<any>;
+  @ViewChild(TemplateRef, { static: true }) templateRef: TemplateRef<unknown>;
 
   // eslint-disable-next-line no-use-before-define
   context: { $implicit: RuleComponent } = {
@@ -78,7 +78,7 @@ export class RuleComponent implements OnChanges {
       .keys(changes)
       .forEach(key => {
         if (!['for', 'key'].includes(key) && changes[key].firstChange) {
-          rule[key] = this[key];
+          rule[key as 'for' | 'key'] = this[key as 'for' | 'key'];
         }
       });
 
diff --git a/packages/qgrid-ngx-plugins/tsconfig.lib.json b/packages/qgrid-ngx-plugins/tsconfig.lib.json
index 414d37cce..f9259266a 100644
--- a/packages/qgrid-ngx-plugins/tsconfig.lib.json
+++ b/packages/qgrid-ngx-plugins/tsconfig.lib.json
@@ -21,7 +21,14 @@
     "lib": [
       "dom",
       "esnext"
-    ]
+    ],
+    "alwaysStrict": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictPropertyInitialization": false,
+    "strictFunctionTypes": true,
+    "strictBindCallApply": true,
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
diff --git a/packages/qgrid-plugins/public-api.d.ts b/packages/qgrid-plugins/public-api.d.ts
index 14e453b73..0f800f346 100644
--- a/packages/qgrid-plugins/public-api.d.ts
+++ b/packages/qgrid-plugins/public-api.d.ts
@@ -20,7 +20,7 @@ export { ExportPlugin } from './src/export/export.plugin';
 // focus
 export { FocusPlugin } from './src/focus/focus.plugin';
 // import
-export { ImportPlugin } from './src/import/import.plugin';
+export { ImportPlugin, ImportOptions } from './src/import/import.plugin';
 // pager
 export { PagerPlugin } from './src/pager/pager.plugin';
 // persistence
diff --git a/yarn.lock b/yarn.lock
index 98b61d054..49155f4a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3171,13 +3171,6 @@ array-ify@^1.0.0:
   resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"
   integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
@@ -3188,11 +3181,6 @@ array-union@^3.0.1:
   resolved "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz"
   integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
@@ -3917,16 +3905,11 @@ command-line-args@^5.2.0:
     lodash.camelcase "^4.3.0"
     typical "^4.0.0"
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.20.0:
+commander@^2.11.0, commander@^2.12.1, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^3.0.0-0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
-  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
-
 commander@^8.0.0:
   version "8.3.0"
   resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
@@ -4720,11 +4703,6 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.43.tgz#665c0cd8d5e7cce0ba78d90a514c8c813ca3bdbe"
   integrity sha512-PO3kEfcxPrti/4STbXvCkNIF4fgWvCKl2508e6UI7KomCDffpIfeBZLXsh5DK/XGsjUw3kwq6WEsi0MJTlGAdg==
 
-email-addresses@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.1.0.tgz#cabf7e085cbdb63008a70319a74e6136188812fb"
-  integrity sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
@@ -4999,7 +4977,7 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -5556,7 +5534,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.1, fs-extra@^9.1.0:
+fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -5715,19 +5693,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gh-pages@^3.1.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-3.2.3.tgz#897e5f15e111f42af57d21d430b83e5cdf29472c"
-  integrity sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==
-  dependencies:
-    async "^2.6.1"
-    commander "^2.18.0"
-    email-addresses "^3.0.1"
-    filenamify "^4.3.0"
-    find-cache-dir "^3.3.1"
-    fs-extra "^8.1.0"
-    globby "^6.1.0"
-
 git-raw-commits@^2.0.8:
   version "2.0.10"
   resolved "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.10.tgz"
@@ -8057,7 +8022,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -10283,13 +10248,6 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-outer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
-  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 strong-log-transformer@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz"