diff --git a/demo/src/assets/json/current-version.json b/demo/src/assets/json/current-version.json
index ffcaa06e6c..743c5fbd2e 100644
--- a/demo/src/assets/json/current-version.json
+++ b/demo/src/assets/json/current-version.json
@@ -1 +1 @@
-{"version":"4.0.1"}
+{"version":"5.6.2"}
\ No newline at end of file
diff --git a/demo/src/ng-api-doc.ts b/demo/src/ng-api-doc.ts
index 7fb21c08e4..c9d01300e4 100644
--- a/demo/src/ng-api-doc.ts
+++ b/demo/src/ng-api-doc.ts
@@ -537,7 +537,7 @@ export const ngdoc: any = {
     "properties": [
       {
         "name": "_a",
-        "type": "number[]",
+        "type": "DateArray",
         "description": "<p>DateArray [year, month, date, .....]</p>\n"
       },
       {
@@ -613,7 +613,7 @@ export const ngdoc: any = {
       {
         "name": "_w",
         "type": "WeekParsing",
-        "description": "<p>date specific info\nweek</p>\n"
+        "description": "<p>week</p>\n"
       }
     ]
   },
@@ -2352,12 +2352,6 @@ export const ngdoc: any = {
           }
         ],
         "returnType": "BsModalRef"
-      },
-      {
-        "name": "checkScrollbar",
-        "description": "<p>Checks if the body is overflowing and sets scrollbar width</p>\n",
-        "args": [],
-        "returnType": "void"
       }
     ],
     "properties": []
@@ -2518,12 +2512,6 @@ export const ngdoc: any = {
         "description": "<p>Events tricks</p>\n",
         "args": [],
         "returnType": "void"
-      },
-      {
-        "name": "checkScrollbar",
-        "description": "<p>Scroll bar tricks</p>\n",
-        "args": [],
-        "returnType": "void"
       }
     ]
   },
@@ -4013,7 +4001,12 @@ export const ngdoc: any = {
     "description": "",
     "selector": "typeahead-container",
     "inputs": [],
-    "outputs": [],
+    "outputs": [
+      {
+        "name": "activeChange",
+        "description": ""
+      }
+    ],
     "properties": [],
     "methods": []
   },
@@ -4220,9 +4213,9 @@ export const ngdoc: any = {
     ],
     "properties": [
       {
-        "name": "_container",
-        "type": "TypeaheadContainerComponent",
-        "description": "<p>if false restrict model values to the ones selected from the popup only will be provided\nif false the first match automatically will not be focused as you type\nformat the ng-model result after selection\nif true automatically select an item when there is one option that exactly matches the user input\nif true select the currently highlighted match on blur\nif false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
+        "name": "activeDescendant",
+        "type": "string",
+        "description": "<p>if false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
       }
     ],
     "methods": []
diff --git a/schematics/src/utils/index.ts b/schematics/src/utils/index.ts
index 140de3bf38..05f624c07b 100644
--- a/schematics/src/utils/index.ts
+++ b/schematics/src/utils/index.ts
@@ -122,6 +122,7 @@ export function createTestApp(runner: SchematicTestRunner, appOptions = {}): any
     newProjectRoot: 'projects'
   });
 
+
   return runner.runExternalSchematicAsync('@schematics/angular', 'application',
     { name: 'ngx-bootstrap', ...appOptions }, workspaceTree);
 }
diff --git a/src/accordion/accordion.module.ts b/src/accordion/accordion.module.ts
index deabe52c8d..4778703c8f 100644
--- a/src/accordion/accordion.module.ts
+++ b/src/accordion/accordion.module.ts
@@ -13,7 +13,7 @@ import { CollapseModule } from 'ngx-bootstrap/collapse';
   exports: [AccordionComponent, AccordionPanelComponent]
 })
 export class AccordionModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<AccordionModule> {
     return { ngModule: AccordionModule, providers: [AccordionConfig] };
   }
 }
diff --git a/src/alert/alert.module.ts b/src/alert/alert.module.ts
index c1574a6331..25efd436ec 100644
--- a/src/alert/alert.module.ts
+++ b/src/alert/alert.module.ts
@@ -10,7 +10,7 @@ import { AlertConfig } from './alert.config';
   entryComponents: [AlertComponent]
 })
 export class AlertModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<AlertModule> {
     return { ngModule: AlertModule, providers: [AlertConfig] };
   }
 }
diff --git a/src/buttons/buttons.module.ts b/src/buttons/buttons.module.ts
index 9b2a17d0d3..7c59bbe825 100644
--- a/src/buttons/buttons.module.ts
+++ b/src/buttons/buttons.module.ts
@@ -9,7 +9,7 @@ import { ButtonRadioGroupDirective } from './button-radio-group.directive';
   exports: [ButtonCheckboxDirective, ButtonRadioDirective, ButtonRadioGroupDirective]
 })
 export class ButtonsModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<ButtonsModule> {
     return { ngModule: ButtonsModule, providers: [] };
   }
 }
diff --git a/src/carousel/carousel.module.ts b/src/carousel/carousel.module.ts
index 9694f80077..cad37f3ae1 100644
--- a/src/carousel/carousel.module.ts
+++ b/src/carousel/carousel.module.ts
@@ -12,7 +12,7 @@ import { CarouselConfig } from './carousel.config';
   providers: [CarouselConfig]
 })
 export class CarouselModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<CarouselModule> {
     return { ngModule: CarouselModule, providers: [] };
   }
 }
diff --git a/src/collapse/collapse.module.ts b/src/collapse/collapse.module.ts
index 92db595c51..94751fb209 100644
--- a/src/collapse/collapse.module.ts
+++ b/src/collapse/collapse.module.ts
@@ -7,7 +7,7 @@ import { CollapseDirective } from './collapse.directive';
   exports: [CollapseDirective]
 })
 export class CollapseModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<CollapseModule> {
     return { ngModule: CollapseModule, providers: [] };
   }
 }
diff --git a/src/datepicker/bs-datepicker.module.ts b/src/datepicker/bs-datepicker.module.ts
index 29b7b9e331..9c9abfa4f3 100644
--- a/src/datepicker/bs-datepicker.module.ts
+++ b/src/datepicker/bs-datepicker.module.ts
@@ -79,7 +79,7 @@ import { BsYearsCalendarViewComponent } from './themes/bs/bs-years-calendar-view
   ]
 })
 export class BsDatepickerModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<BsDatepickerModule> {
     return {
       ngModule: BsDatepickerModule,
       providers: [
diff --git a/src/datepicker/datepicker.module.ts b/src/datepicker/datepicker.module.ts
index 16876e9624..efd797deaf 100644
--- a/src/datepicker/datepicker.module.ts
+++ b/src/datepicker/datepicker.module.ts
@@ -28,7 +28,7 @@ import { YearPickerComponent } from './yearpicker.component';
   entryComponents: [DatePickerComponent]
 })
 export class DatepickerModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<DatepickerModule> {
     return { ngModule: DatepickerModule, providers: [DatepickerConfig] };
   }
 }
diff --git a/src/dropdown/bs-dropdown.module.ts b/src/dropdown/bs-dropdown.module.ts
index 05374b5903..f44d3380d5 100644
--- a/src/dropdown/bs-dropdown.module.ts
+++ b/src/dropdown/bs-dropdown.module.ts
@@ -26,7 +26,7 @@ import { BsDropdownState } from './bs-dropdown.state';
 })
 export class BsDropdownModule {
   // tslint:disable-next-line:no-any
-  static forRoot(config?: any): ModuleWithProviders {
+  static forRoot(config?: any): ModuleWithProviders<BsDropdownModule> {
     return {
       ngModule: BsDropdownModule,
       providers: [
diff --git a/src/modal/modal.module.ts b/src/modal/modal.module.ts
index 2fb263e0df..8942f926a1 100644
--- a/src/modal/modal.module.ts
+++ b/src/modal/modal.module.ts
@@ -17,13 +17,13 @@ import { BsModalService } from './bs-modal.service';
   entryComponents: [ModalBackdropComponent, ModalContainerComponent]
 })
 export class ModalModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<ModalModule> {
     return {
       ngModule: ModalModule,
       providers: [BsModalService, ComponentLoaderFactory, PositioningService]
     };
   }
-  static forChild(): ModuleWithProviders {
+  static forChild(): ModuleWithProviders<ModalModule> {
     return {
       ngModule: ModalModule,
       providers: [BsModalService, ComponentLoaderFactory, PositioningService]
diff --git a/src/pagination/pagination.module.ts b/src/pagination/pagination.module.ts
index 4276ac4267..386739a2e2 100644
--- a/src/pagination/pagination.module.ts
+++ b/src/pagination/pagination.module.ts
@@ -11,7 +11,7 @@ import { PaginationComponent } from './pagination.component';
   exports: [PagerComponent, PaginationComponent]
 })
 export class PaginationModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<PaginationModule> {
     return { ngModule: PaginationModule, providers: [PaginationConfig] };
   }
 }
diff --git a/src/popover/popover.module.ts b/src/popover/popover.module.ts
index 0e99cda77e..59464924e5 100644
--- a/src/popover/popover.module.ts
+++ b/src/popover/popover.module.ts
@@ -14,7 +14,7 @@ import { PopoverContainerComponent } from './popover-container.component';
   entryComponents: [PopoverContainerComponent]
 })
 export class PopoverModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<PopoverModule> {
     return {
       ngModule: PopoverModule,
       providers: [PopoverConfig, ComponentLoaderFactory, PositioningService]
diff --git a/src/progressbar/progressbar.module.ts b/src/progressbar/progressbar.module.ts
index 26c7625062..cf6c34f932 100644
--- a/src/progressbar/progressbar.module.ts
+++ b/src/progressbar/progressbar.module.ts
@@ -11,7 +11,7 @@ import { ProgressbarConfig } from './progressbar.config';
   exports: [BarComponent, ProgressbarComponent]
 })
 export class ProgressbarModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<ProgressbarModule> {
     return { ngModule: ProgressbarModule, providers: [ProgressbarConfig] };
   }
 }
diff --git a/src/rating/rating.module.ts b/src/rating/rating.module.ts
index 37e5fd9a90..01f743eade 100644
--- a/src/rating/rating.module.ts
+++ b/src/rating/rating.module.ts
@@ -10,7 +10,7 @@ import { RatingConfig } from './rating.config';
   exports: [RatingComponent]
 })
 export class RatingModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<RatingModule> {
     return {
       ngModule: RatingModule,
       providers: [RatingConfig]
diff --git a/src/sortable/sortable.module.ts b/src/sortable/sortable.module.ts
index a0c51b6f46..ab4ef68b4d 100644
--- a/src/sortable/sortable.module.ts
+++ b/src/sortable/sortable.module.ts
@@ -10,7 +10,7 @@ import { DraggableItemService } from './draggable-item.service';
   exports: [SortableComponent]
 })
 export class SortableModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<SortableModule> {
     return { ngModule: SortableModule, providers: [DraggableItemService] };
   }
 }
diff --git a/src/tabs/tabs.module.ts b/src/tabs/tabs.module.ts
index 422e7d01e5..a514ca3364 100644
--- a/src/tabs/tabs.module.ts
+++ b/src/tabs/tabs.module.ts
@@ -23,7 +23,7 @@ import { TabsetConfig } from './tabset.config';
   ]
 })
 export class TabsModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<TabsModule> {
     return {
       ngModule: TabsModule,
       providers: [TabsetConfig]
diff --git a/src/timepicker/timepicker.module.ts b/src/timepicker/timepicker.module.ts
index f0fb71564c..38af0f0412 100644
--- a/src/timepicker/timepicker.module.ts
+++ b/src/timepicker/timepicker.module.ts
@@ -12,7 +12,7 @@ import { TimepickerStore } from './reducer/timepicker.store';
   exports: [TimepickerComponent]
 })
 export class TimepickerModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<TimepickerModule> {
     return {
       ngModule: TimepickerModule,
       providers: [TimepickerConfig, TimepickerActions, TimepickerStore]
diff --git a/src/tooltip/tooltip.module.ts b/src/tooltip/tooltip.module.ts
index c3a6f976fc..4231a74e06 100644
--- a/src/tooltip/tooltip.module.ts
+++ b/src/tooltip/tooltip.module.ts
@@ -13,7 +13,7 @@ import { PositioningService } from 'ngx-bootstrap/positioning';
   entryComponents: [TooltipContainerComponent]
 })
 export class TooltipModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<TooltipModule> {
     return {
       ngModule: TooltipModule,
       providers: [TooltipConfig, ComponentLoaderFactory, PositioningService]
diff --git a/src/typeahead/typeahead.module.ts b/src/typeahead/typeahead.module.ts
index 35b0e8b573..677745f620 100644
--- a/src/typeahead/typeahead.module.ts
+++ b/src/typeahead/typeahead.module.ts
@@ -14,7 +14,7 @@ import { TypeaheadConfig } from './typeahead.config';
   entryComponents: [TypeaheadContainerComponent]
 })
 export class TypeaheadModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<TypeaheadModule> {
     return {
       ngModule: TypeaheadModule,
       providers: [ComponentLoaderFactory, PositioningService, TypeaheadConfig]