diff --git a/lib/components/SchemaSample/schema-sample.ts b/lib/components/SchemaSample/schema-sample.ts
index 24e99b28..012e4f9a 100644
--- a/lib/components/SchemaSample/schema-sample.ts
+++ b/lib/components/SchemaSample/schema-sample.ts
@@ -91,7 +91,7 @@ export class SchemaSample extends BaseComponent implements OnInit {
 
       this.componentSchema = this._normalizer.normalize(this.componentSchema, this.pointer);
 
-      let discriminator = this.componentSchema.discriminator || this.componentSchema['x-discriminatorBasePointer'];
+      let discriminator = this.componentSchema.discriminator || this.componentSchema['x-discriminatorBasePointer'] || this.componentSchema['x-extendedDiscriminator'];
       if (discriminator) {
         let descendants = this.specMgr.findDerivedDefinitions(this.componentSchema._pointer || this.pointer, this.componentSchema);
         if (descendants.length) {
diff --git a/lib/services/schema-changer.service.ts b/lib/services/schema-changer.service.ts
index c85718dc..6a2ff909 100644
--- a/lib/services/schema-changer.service.ts
+++ b/lib/services/schema-changer.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { Subject }    from 'rxjs/Subject';
-import { Observable } from '@angular/core';
 
 @Injectable()
 export class SchemaChangerService {
diff --git a/package.json b/package.json
index 8c834f67..6faef984 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
   "author": "Roman Hotsiy",
   "license": "MIT",
   "devDependencies": {
+    "@angular/cli": "^1.6.0",
     "@angular/common": "^4.3.2",
     "@angular/compiler": "^4.3.2",
     "@angular/compiler-cli": "^4.3.2",
@@ -109,7 +110,7 @@
     "style-loader": "^0.18.2",
     "swagger-schema-official": "^2.0.0-bab6bed",
     "tslint": "^5.5.0",
-    "typescript": "^2.4.2",
+    "typescript": "^2.3.4",
     "webpack": "^3.4.1",
     "webpack-dev-server": "^2.6.1",
     "webpack-merge": "^4.1.0"