diff --git a/lib/components/block-ui-content/block-ui-content.component.ts b/lib/components/block-ui-content/block-ui-content.component.ts
index 05729ec..ffa9c0f 100644
--- a/lib/components/block-ui-content/block-ui-content.component.ts
+++ b/lib/components/block-ui-content/block-ui-content.component.ts
@@ -5,7 +5,10 @@ import {
   ViewEncapsulation,
   Input
 } from '@angular/core';
-import { Observable, Subscription } from 'rxjs/Rx';
+import 'rxjs/add/operator/map';
+import { Observable } from 'rxjs/Observable';
+import { Subscription } from 'rxjs/Subscription';
+
 import { BlockUIService } from '../../services/block-ui.service';
 import { BlockUIEvent } from '../../models/block-ui-action.model';
 import { BlockUIActions } from '../../constants/block-ui-actions.constant';
diff --git a/lib/services/block-ui.service.ts b/lib/services/block-ui.service.ts
index 4b2d700..f467c6d 100644
--- a/lib/services/block-ui.service.ts
+++ b/lib/services/block-ui.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Observable, Subject, ReplaySubject } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { BlockUIActions } from '../constants/block-ui-actions.constant';
 import { BlockUIDefaultName } from '../constants/block-ui-default-name.constant';
 import { NgBlockUI } from '../models/block-ui.model';