diff --git a/nativescript-angular/dom-adapter.ts b/nativescript-angular/dom-adapter.ts
index 29b80f28e..d07d9cac6 100644
--- a/nativescript-angular/dom-adapter.ts
+++ b/nativescript-angular/dom-adapter.ts
@@ -35,6 +35,14 @@ export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
   securityContext(tagName: string, propName: string): any {
       return SecurityContext.NONE;
   }
+
+  validateProperty(name: string): {error: boolean, msg?: string} {
+      return {error: false};
+  }
+
+  validateAttribute(name: string): {error: boolean, msg?: string} {
+      return {error: false};
+  }
 }
 
 export class NativeScriptSanitizer extends Sanitizer {
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index f72db3902..296a2738c 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -18,18 +18,17 @@
     "prepublish": "tsc"
   },
   "dependencies": {
-    "nativescript-intl": "^0.0.4",
-    "@angular/core": "2.0.1",
-    "@angular/common": "2.0.1",
-    "@angular/compiler": "2.0.1",
-    "@angular/http": "2.0.1",
-    "@angular/platform-browser": "2.0.1",
-    "@angular/platform-browser-dynamic": "2.0.1",
-    "@angular/platform-server": "2.0.1",
-    "@angular/forms": "2.0.1",
-    "@angular/router": "3.0.1",
+    "nativescript-intl": "~0.0.4",
+    "@angular/core": "~2.0.0",
+    "@angular/common": "~2.0.0",
+    "@angular/compiler": "~2.0.0",
+    "@angular/http": "~2.0.0",
+    "@angular/platform-browser": "~2.0.0",
+    "@angular/platform-browser-dynamic": "~2.0.0",
+    "@angular/forms": "~2.0.0",
+    "@angular/router": "~3.0.0",
     "rxjs": "5.0.0-beta.12",
-    "reflect-metadata": "^0.1.8",
+    "reflect-metadata": "~0.1.8",
     "parse5": "1.3.2",
     "punycode": "1.3.2",
     "querystring": "0.2.0",
diff --git a/nativescript-angular/parse5_adapter.ts b/nativescript-angular/parse5_adapter.ts
index e6f560996..d6f40499b 100644
--- a/nativescript-angular/parse5_adapter.ts
+++ b/nativescript-angular/parse5_adapter.ts
@@ -6,30 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-var parse5 = require('parse5/index');
+const parse5 = require('parse5');
 
-import {ListWrapper, StringMapWrapper} from './collection-facade';
+import {ListWrapper} from './collection-facade';
 import {DomAdapter, setRootDomAdapter} from './private_import_platform-browser';
-import {isPresent, isBlank, global, setValueOnPath, DateWrapper} from "./lang-facade";
+import {isPresent, isBlank, setValueOnPath} from "./lang-facade";
 import {SelectorMatcher, CssSelector} from './private_import_compiler';
-import {Type} from '@angular/core';
-import {ResourceLoader} from '@angular/compiler';
 
 var parser: any /** TODO #9100 */ = null;
 var serializer: any /** TODO #9100 */ = null;
 var treeAdapter: any /** TODO #9100 */ = null;
 
-var _attrToPropMap: {[key: string]: string} = {
+const _attrToPropMap: {[key: string]: string} = {
   'class': 'className',
   'innerHtml': 'innerHTML',
   'readonly': 'readOnly',
   'tabindex': 'tabIndex',
 };
-var defDoc: any /** TODO #9100 */ = null;
 
-var mapProps = ['attribs', 'x-attribsNamespace', 'x-attribsPrefix'];
+let defDoc: any = null;
 
-function _notImplemented(methodName: any /** TODO #9100 */) {
+const mapProps = ['attribs', 'x-attribsNamespace', 'x-attribsPrefix'];
+
+function _notImplemented(methodName: string) {
   return new Error('This method is not implemented in Parse5DomAdapter: ' + methodName);
 }
 
@@ -48,12 +47,12 @@ export class Parse5DomAdapter extends DomAdapter {
     setRootDomAdapter(new Parse5DomAdapter());
   }
 
-  hasProperty(element: any /** TODO #9100 */, name: string): boolean {
+  hasProperty(element: any, name: string): boolean {
     return _HTMLElementPropertyList.indexOf(name) > -1;
   }
   // TODO(tbosch): don't even call this method when we run the tests on server side
   // by not using the DomRenderer in tests. Keeping this for now to make tests happy...
-  setProperty(el: /*element*/ any, name: string, value: any) {
+  setProperty(el: any, name: string, value: any) {
     if (name === 'innerHTML') {
       this.setInnerHTML(el, value);
     } else if (name === 'className') {
@@ -64,179 +63,158 @@ export class Parse5DomAdapter extends DomAdapter {
   }
   // TODO(tbosch): don't even call this method when we run the tests on server side
   // by not using the DomRenderer in tests. Keeping this for now to make tests happy...
-  getProperty(el: /*element*/ any, name: string): any { return el[name]; }
+  getProperty(el: any, name: string): any { return el[name]; }
 
-  logError(error: any /** TODO #9100 */) { console.error(error); }
+  logError(error: string) { console.error(error); }
 
-  log(error: any /** TODO #9100 */) { console.log(error); }
+  log(error: string) { console.log(error); }
 
-  logGroup(error: any /** TODO #9100 */) { console.error(error); }
+  logGroup(error: string) { console.error(error); }
 
   logGroupEnd() {}
 
   get attrToPropMap() { return _attrToPropMap; }
 
-  query(selector: any /** TODO #9100 */) { throw _notImplemented('query'); }
-  querySelector(el: any /** TODO #9100 */, selector: string): any {
-    return this.querySelectorAll(el, selector)[0];
-  }
-  querySelectorAll(el: any /** TODO #9100 */, selector: string): any[] {
-    var res: any[] /** TODO #9100 */ = [];
-    var _recursive =
-        (result: any /** TODO #9100 */, node: any /** TODO #9100 */,
-         selector: any /** TODO #9100 */, matcher: any /** TODO #9100 */) => {
-          var cNodes = node.childNodes;
-          if (cNodes && cNodes.length > 0) {
-            for (var i = 0; i < cNodes.length; i++) {
-              var childNode = cNodes[i];
-              if (this.elementMatches(childNode, selector, matcher)) {
-                result.push(childNode);
-              }
-              _recursive(result, childNode, selector, matcher);
-            }
+  query(selector: any) { throw _notImplemented('query'); }
+  querySelector(el: any, selector: string): any { return this.querySelectorAll(el, selector)[0]; }
+  querySelectorAll(el: any, selector: string): any[] {
+    const res: any[] = [];
+    const _recursive = (result: any, node: any, selector: any, matcher: any) => {
+      let cNodes = node.childNodes;
+      if (cNodes && cNodes.length > 0) {
+        for (let i = 0; i < cNodes.length; i++) {
+          const childNode = cNodes[i];
+          if (this.elementMatches(childNode, selector, matcher)) {
+            result.push(childNode);
           }
-        };
-    var matcher = new SelectorMatcher();
+          _recursive(result, childNode, selector, matcher);
+        }
+      }
+    };
+    const matcher = new SelectorMatcher();
     matcher.addSelectables(CssSelector.parse(selector));
     _recursive(res, el, selector, matcher);
     return res;
   }
-  elementMatches(
-      node: any /** TODO #9100 */, selector: string,
-      matcher: any /** TODO #9100 */ = null): boolean {
+  elementMatches(node: any, selector: string, matcher: any = null): boolean {
     if (this.isElementNode(node) && selector === '*') {
       return true;
     }
-    var result = false;
+    let result = false;
     if (selector && selector.charAt(0) == '#') {
       result = this.getAttribute(node, 'id') == selector.substring(1);
     } else if (selector) {
-      var result = false;
-      if (matcher == null) {
+      if (!matcher) {
         matcher = new SelectorMatcher();
         matcher.addSelectables(CssSelector.parse(selector));
       }
 
-      var cssSelector = new CssSelector();
+      const cssSelector = new CssSelector();
       cssSelector.setElement(this.tagName(node));
       if (node.attribs) {
-        for (var attrName in node.attribs) {
+        for (const attrName in node.attribs) {
           cssSelector.addAttribute(attrName, node.attribs[attrName]);
         }
       }
-      var classList = this.classList(node);
-      for (var i = 0; i < classList.length; i++) {
+      const classList = this.classList(node);
+      for (let i = 0; i < classList.length; i++) {
         cssSelector.addClassName(classList[i]);
       }
 
-      matcher.match(
-          cssSelector,
-          function(selector: any /** TODO #9100 */, cb: any /** TODO #9100 */) { result = true; });
+      matcher.match(cssSelector, function(selector: any, cb: any) { result = true; });
     }
     return result;
   }
-  on(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */) {
-    var listenersMap: {[k: /*any*/ string]: any} = el._eventListenersMap;
-    if (isBlank(listenersMap)) {
-      var listenersMap: {[k: /*any*/ string]: any} = StringMapWrapper.create();
+  on(el: any, evt: any, listener: any) {
+    let listenersMap: {[k: string]: any} = el._eventListenersMap;
+    if (!listenersMap) {
+      listenersMap = {};
       el._eventListenersMap = listenersMap;
     }
-    var listeners = StringMapWrapper.get(listenersMap, evt);
-    if (isBlank(listeners)) {
-      listeners = [];
-    }
-    listeners.push(listener);
-    StringMapWrapper.set(listenersMap, evt, listeners);
+    const listeners = listenersMap[evt] || [];
+    listenersMap[evt] = [...listeners, listener];
   }
-  onAndCancel(
-      el: any /** TODO #9100 */, evt: any /** TODO #9100 */,
-      listener: any /** TODO #9100 */): Function {
+  onAndCancel(el: any, evt: any, listener: any): Function {
     this.on(el, evt, listener);
-    return () => {
-      ListWrapper.remove(StringMapWrapper.get<any[]>(el._eventListenersMap, evt), listener);
-    };
+    return () => { ListWrapper.remove(<any[]>(el._eventListenersMap[evt]), listener); };
   }
-  dispatchEvent(el: any /** TODO #9100 */, evt: any /** TODO #9100 */) {
-    if (isBlank(evt.target)) {
+  dispatchEvent(el: any, evt: any) {
+    if (!evt.target) {
       evt.target = el;
     }
-    if (isPresent(el._eventListenersMap)) {
-      var listeners: any = StringMapWrapper.get(el._eventListenersMap, evt.type);
-      if (isPresent(listeners)) {
-        for (var i = 0; i < listeners.length; i++) {
+    if (el._eventListenersMap) {
+      const listeners: any = el._eventListenersMap[evt.type];
+      if (listeners) {
+        for (let i = 0; i < listeners.length; i++) {
           listeners[i](evt);
         }
       }
     }
-    if (isPresent(el.parent)) {
+    if (el.parent) {
       this.dispatchEvent(el.parent, evt);
     }
-    if (isPresent(el._window)) {
+    if (el._window) {
       this.dispatchEvent(el._window, evt);
     }
   }
-  createMouseEvent(eventType: any /** TODO #9100 */): Event { return this.createEvent(eventType); }
+  createMouseEvent(eventType: any): Event { return this.createEvent(eventType); }
   createEvent(eventType: string): Event {
-    var evt = <Event>{
+    let event = <Event>{
       type: eventType,
       defaultPrevented: false,
-      preventDefault: () => { (<any>evt).defaultPrevented = true; }
+      preventDefault: () => { (<any>event).defaultPrevented = true; }
     };
-    return evt;
-  }
-  preventDefault(evt: any /** TODO #9100 */) { evt.returnValue = false; }
-  isPrevented(evt: any /** TODO #9100 */): boolean {
-    return isPresent(evt.returnValue) && !evt.returnValue;
+    return event;
   }
-  getInnerHTML(el: any /** TODO #9100 */): string {
-    return serializer.serialize(this.templateAwareRoot(el));
+  preventDefault(event: any) { event.returnValue = false; }
+  isPrevented(event: any): boolean { return isPresent(event.returnValue) && !event.returnValue; }
+  getInnerHTML(el: any): string {
+    return parse5.serialize(this.templateAwareRoot(el), {treeAdapter});
   }
-  getTemplateContent(el: any /** TODO #9100 */): Node {
-    return null;  // no <template> support in parse5.
+  getTemplateContent(el: any): Node { return null; }
+  getOuterHTML(el: any): string {
+    const fragment = treeAdapter.createDocumentFragment();
+    this.appendChild(fragment, el);
+    return parse5.serialize(fragment, {treeAdapter});
   }
-  getOuterHTML(el: any /** TODO #9100 */): string {
-    serializer.html = '';
-    serializer._serializeElement(el);
-    return serializer.html;
-  }
-  nodeName(node: any /** TODO #9100 */): string { return node.tagName; }
-  nodeValue(node: any /** TODO #9100 */): string { return node.nodeValue; }
+  nodeName(node: any): string { return node.tagName; }
+  nodeValue(node: any): string { return node.nodeValue; }
   type(node: any): string { throw _notImplemented('type'); }
-  content(node: any /** TODO #9100 */): string { return node.childNodes[0]; }
-  firstChild(el: any /** TODO #9100 */): Node { return el.firstChild; }
-  nextSibling(el: any /** TODO #9100 */): Node { return el.nextSibling; }
-  parentElement(el: any /** TODO #9100 */): Node { return el.parent; }
-  childNodes(el: any /** TODO #9100 */): Node[] { return el.childNodes; }
-  childNodesAsList(el: any /** TODO #9100 */): any[] {
-    var childNodes = el.childNodes;
-    var res = ListWrapper.createFixedSize(childNodes.length);
-    for (var i = 0; i < childNodes.length; i++) {
+  content(node: any): string { return node.childNodes[0]; }
+  firstChild(el: any): Node { return el.firstChild; }
+  nextSibling(el: any): Node { return el.nextSibling; }
+  parentElement(el: any): Node { return el.parent; }
+  childNodes(el: any): Node[] { return el.childNodes; }
+  childNodesAsList(el: any): any[] {
+    const childNodes = el.childNodes;
+    const res = new Array(childNodes.length);
+    for (let i = 0; i < childNodes.length; i++) {
       res[i] = childNodes[i];
     }
     return res;
   }
-  clearNodes(el: any /** TODO #9100 */) {
+  clearNodes(el: any) {
     while (el.childNodes.length > 0) {
       this.remove(el.childNodes[0]);
     }
   }
-  appendChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
+  appendChild(el: any, node: any) {
     this.remove(node);
     treeAdapter.appendChild(this.templateAwareRoot(el), node);
   }
-  removeChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
-    if (ListWrapper.contains(el.childNodes, node)) {
+  removeChild(el: any, node: any) {
+    if (el.childNodes.indexOf(node) > -1) {
       this.remove(node);
     }
   }
-  remove(el: any /** TODO #9100 */): HTMLElement {
-    var parent = el.parent;
+  remove(el: any): HTMLElement {
+    const parent = el.parent;
     if (parent) {
-      var index = parent.childNodes.indexOf(el);
+      const index = parent.childNodes.indexOf(el);
       parent.childNodes.splice(index, 1);
     }
-    var prev = el.previousSibling;
-    var next = el.nextSibling;
+    const prev = el.previousSibling;
+    const next = el.nextSibling;
     if (prev) {
       prev.next = next;
     }
@@ -248,45 +226,48 @@ export class Parse5DomAdapter extends DomAdapter {
     el.parent = null;
     return el;
   }
-  insertBefore(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
+  insertBefore(el: any, node: any) {
     this.remove(node);
     treeAdapter.insertBefore(el.parent, node, el);
   }
-  insertAllBefore(el: any /** TODO #9100 */, nodes: any /** TODO #9100 */) {
-    nodes.forEach((n: any /** TODO #9100 */) => this.insertBefore(el, n));
-  }
-  insertAfter(el: any /** TODO #9100 */, node: any /** TODO #9100 */) {
+  insertAllBefore(el: any, nodes: any) { nodes.forEach((n: any) => this.insertBefore(el, n)); }
+  insertAfter(el: any, node: any) {
     if (el.nextSibling) {
       this.insertBefore(el.nextSibling, node);
     } else {
       this.appendChild(el.parent, node);
     }
   }
-  setInnerHTML(el: any /** TODO #9100 */, value: any /** TODO #9100 */) {
+  setInnerHTML(el: any, value: any) {
     this.clearNodes(el);
-    var content = parser.parseFragment(value);
-    for (var i = 0; i < content.childNodes.length; i++) {
+    const content = parser.parseFragment(value);
+    for (let i = 0; i < content.childNodes.length; i++) {
       treeAdapter.appendChild(el, content.childNodes[i]);
     }
   }
-  getText(el: any /** TODO #9100 */, isRecursive?: boolean): string {
+  getText(el: any, isRecursive?: boolean): string {
     if (this.isTextNode(el)) {
       return el.data;
-    } else if (this.isCommentNode(el)) {
+    }
+
+    if (this.isCommentNode(el)) {
       // In the DOM, comments within an element return an empty string for textContent
       // However, comment node instances return the comment content for textContent getter
       return isRecursive ? '' : el.data;
-    } else if (isBlank(el.childNodes) || el.childNodes.length == 0) {
+    }
+
+    if (!el.childNodes || el.childNodes.length == 0) {
       return '';
-    } else {
-      var textContent = '';
-      for (var i = 0; i < el.childNodes.length; i++) {
-        textContent += this.getText(el.childNodes[i], true);
-      }
-      return textContent;
     }
+
+    let textContent = '';
+    for (let i = 0; i < el.childNodes.length; i++) {
+      textContent += this.getText(el.childNodes[i], true);
+    }
+    return textContent;
   }
-  setText(el: any /** TODO #9100 */, value: string) {
+
+  setText(el: any, value: string) {
     if (this.isTextNode(el) || this.isCommentNode(el)) {
       el.data = value;
     } else {
@@ -294,25 +275,25 @@ export class Parse5DomAdapter extends DomAdapter {
       if (value !== '') treeAdapter.insertText(el, value);
     }
   }
-  getValue(el: any /** TODO #9100 */): string { return el.value; }
-  setValue(el: any /** TODO #9100 */, value: string) { el.value = value; }
-  getChecked(el: any /** TODO #9100 */): boolean { return el.checked; }
-  setChecked(el: any /** TODO #9100 */, value: boolean) { el.checked = value; }
+  getValue(el: any): string { return el.value; }
+  setValue(el: any, value: string) { el.value = value; }
+  getChecked(el: any): boolean { return el.checked; }
+  setChecked(el: any, value: boolean) { el.checked = value; }
   createComment(text: string): Comment { return treeAdapter.createCommentNode(text); }
-  createTemplate(html: any /** TODO #9100 */): HTMLElement {
-    var template = treeAdapter.createElement('template', 'http://www.w3.org/1999/xhtml', []);
-    var content = parser.parseFragment(html);
+  createTemplate(html: any): HTMLElement {
+    const template = treeAdapter.createElement('template', 'http://www.w3.org/1999/xhtml', []);
+    const content = parser.parseFragment(html);
     treeAdapter.appendChild(template, content);
     return template;
   }
-  createElement(tagName: any /** TODO #9100 */): HTMLElement {
+  createElement(tagName: any): HTMLElement {
     return treeAdapter.createElement(tagName, 'http://www.w3.org/1999/xhtml', []);
   }
-  createElementNS(ns: any /** TODO #9100 */, tagName: any /** TODO #9100 */): HTMLElement {
+  createElementNS(ns: any, tagName: any): HTMLElement {
     return treeAdapter.createElement(tagName, ns, []);
   }
   createTextNode(text: string): Text {
-    var t = <any>this.createComment(text);
+    const t = <any>this.createComment(text);
     t.type = 'text';
     return t;
   }
@@ -321,23 +302,23 @@ export class Parse5DomAdapter extends DomAdapter {
         'script', 'http://www.w3.org/1999/xhtml', [{name: attrName, value: attrValue}]);
   }
   createStyleElement(css: string): HTMLStyleElement {
-    var style = this.createElement('style');
+    const style = this.createElement('style');
     this.setText(style, css);
     return <HTMLStyleElement>style;
   }
-  createShadowRoot(el: any /** TODO #9100 */): HTMLElement {
+  createShadowRoot(el: any): HTMLElement {
     el.shadowRoot = treeAdapter.createDocumentFragment();
     el.shadowRoot.parent = el;
     return el.shadowRoot;
   }
-  getShadowRoot(el: any /** TODO #9100 */): Element { return el.shadowRoot; }
-  getHost(el: any /** TODO #9100 */): string { return el.host; }
+  getShadowRoot(el: any): Element { return el.shadowRoot; }
+  getHost(el: any): string { return el.host; }
   getDistributedNodes(el: any): Node[] { throw _notImplemented('getDistributedNodes'); }
   clone(node: Node): Node {
-    var _recursive = (node: any /** TODO #9100 */) => {
-      var nodeClone = Object.create(Object.getPrototypeOf(node));
-      for (var prop in node) {
-        var desc = Object.getOwnPropertyDescriptor(node, prop);
+    const _recursive = (node: any) => {
+      const nodeClone = Object.create(Object.getPrototypeOf(node));
+      for (const prop in node) {
+        const desc = Object.getOwnPropertyDescriptor(node, prop);
         if (desc && 'value' in desc && typeof desc.value !== 'object') {
           nodeClone[prop] = node[prop];
         }
@@ -350,17 +331,17 @@ export class Parse5DomAdapter extends DomAdapter {
       mapProps.forEach(mapName => {
         if (isPresent(node[mapName])) {
           nodeClone[mapName] = {};
-          for (var prop in node[mapName]) {
+          for (const prop in node[mapName]) {
             nodeClone[mapName][prop] = node[mapName][prop];
           }
         }
       });
-      var cNodes = node.children;
+      const cNodes = node.children;
       if (cNodes) {
-        var cNodesClone = new Array(cNodes.length);
-        for (var i = 0; i < cNodes.length; i++) {
-          var childNode = cNodes[i];
-          var childNodeClone = _recursive(childNode);
+        const cNodesClone = new Array(cNodes.length);
+        for (let i = 0; i < cNodes.length; i++) {
+          const childNode = cNodes[i];
+          const childNodeClone = _recursive(childNode);
           cNodesClone[i] = childNodeClone;
           if (i > 0) {
             childNodeClone.prev = cNodesClone[i - 1];
@@ -374,109 +355,101 @@ export class Parse5DomAdapter extends DomAdapter {
     };
     return _recursive(node);
   }
-  getElementsByClassName(element: any /** TODO #9100 */, name: string): HTMLElement[] {
+  getElementsByClassName(element: any, name: string): HTMLElement[] {
     return this.querySelectorAll(element, '.' + name);
   }
   getElementsByTagName(element: any, name: string): HTMLElement[] {
     throw _notImplemented('getElementsByTagName');
   }
-  classList(element: any /** TODO #9100 */): string[] {
-    var classAttrValue: any /** TODO #9100 */ = null;
-    var attributes = element.attribs;
+  classList(element: any): string[] {
+    let classAttrValue: any = null;
+    const attributes = element.attribs;
     if (attributes && attributes.hasOwnProperty('class')) {
       classAttrValue = attributes['class'];
     }
     return classAttrValue ? classAttrValue.trim().split(/\s+/g) : [];
   }
-  addClass(element: any /** TODO #9100 */, className: string) {
-    var classList = this.classList(element);
-    var index = classList.indexOf(className);
+  addClass(element: any, className: string) {
+    const classList = this.classList(element);
+    let index = classList.indexOf(className);
     if (index == -1) {
       classList.push(className);
       element.attribs['class'] = element.className = classList.join(' ');
     }
   }
-  removeClass(element: any /** TODO #9100 */, className: string) {
-    var classList = this.classList(element);
-    var index = classList.indexOf(className);
+  removeClass(element: any, className: string) {
+    const classList = this.classList(element);
+    let index = classList.indexOf(className);
     if (index > -1) {
       classList.splice(index, 1);
       element.attribs['class'] = element.className = classList.join(' ');
     }
   }
-  hasClass(element: any /** TODO #9100 */, className: string): boolean {
+  hasClass(element: any, className: string): boolean {
     return ListWrapper.contains(this.classList(element), className);
   }
-  hasStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string = null): boolean {
-    var value = this.getStyle(element, styleName) || '';
+  hasStyle(element: any, styleName: string, styleValue: string = null): boolean {
+    const value = this.getStyle(element, styleName) || '';
     return styleValue ? value == styleValue : value.length > 0;
   }
   /** @internal */
-  _readStyleAttribute(element: any /** TODO #9100 */) {
-    var styleMap = {};
-    var attributes = element.attribs;
+  _readStyleAttribute(element: any) {
+    const styleMap = {};
+    const attributes = element.attribs;
     if (attributes && attributes.hasOwnProperty('style')) {
-      var styleAttrValue = attributes['style'];
-      var styleList = styleAttrValue.split(/;+/g);
-      for (var i = 0; i < styleList.length; i++) {
+      const styleAttrValue = attributes['style'];
+      const styleList = styleAttrValue.split(/;+/g);
+      for (let i = 0; i < styleList.length; i++) {
         if (styleList[i].length > 0) {
-          var elems = styleList[i].split(/:+/g);
-          (styleMap as any /** TODO #9100 */)[elems[0].trim()] = elems[1].trim();
+          const elems = styleList[i].split(/:+/g);
+          (styleMap as any)[elems[0].trim()] = elems[1].trim();
         }
       }
     }
     return styleMap;
   }
   /** @internal */
-  _writeStyleAttribute(element: any /** TODO #9100 */, styleMap: any /** TODO #9100 */) {
-    var styleAttrValue = '';
-    for (var key in styleMap) {
-      var newValue = styleMap[key];
-      if (newValue && newValue.length > 0) {
+  _writeStyleAttribute(element: any, styleMap: any) {
+    let styleAttrValue = '';
+    for (const key in styleMap) {
+      const newValue = styleMap[key];
+      if (newValue) {
         styleAttrValue += key + ':' + styleMap[key] + ';';
       }
     }
     element.attribs['style'] = styleAttrValue;
   }
-  setStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string) {
-    var styleMap = this._readStyleAttribute(element);
-    (styleMap as any /** TODO #9100 */)[styleName] = styleValue;
+  setStyle(element: any, styleName: string, styleValue: string) {
+    const styleMap = this._readStyleAttribute(element);
+    (styleMap as any)[styleName] = styleValue;
     this._writeStyleAttribute(element, styleMap);
   }
-  removeStyle(element: any /** TODO #9100 */, styleName: string) {
-    this.setStyle(element, styleName, null);
-  }
-  getStyle(element: any /** TODO #9100 */, styleName: string): string {
-    var styleMap = this._readStyleAttribute(element);
-    return styleMap.hasOwnProperty(styleName) ? (styleMap as any /** TODO #9100 */)[styleName] : '';
-  }
-  tagName(element: any /** TODO #9100 */): string {
-    return element.tagName == 'style' ? 'STYLE' : element.tagName;
-  }
-  attributeMap(element: any /** TODO #9100 */): Map<string, string> {
-    var res = new Map<string, string>();
-    var elAttrs = treeAdapter.getAttrList(element);
-    for (var i = 0; i < elAttrs.length; i++) {
-      var attrib = elAttrs[i];
+  removeStyle(element: any, styleName: string) { this.setStyle(element, styleName, null); }
+  getStyle(element: any, styleName: string): string {
+    const styleMap = this._readStyleAttribute(element);
+    return styleMap.hasOwnProperty(styleName) ? (styleMap as any)[styleName] : '';
+  }
+  tagName(element: any): string { return element.tagName == 'style' ? 'STYLE' : element.tagName; }
+  attributeMap(element: any): Map<string, string> {
+    const res = new Map<string, string>();
+    const elAttrs = treeAdapter.getAttrList(element);
+    for (let i = 0; i < elAttrs.length; i++) {
+      const attrib = elAttrs[i];
       res.set(attrib.name, attrib.value);
     }
     return res;
   }
-  hasAttribute(element: any /** TODO #9100 */, attribute: string): boolean {
+  hasAttribute(element: any, attribute: string): boolean {
     return element.attribs && element.attribs.hasOwnProperty(attribute);
   }
-  hasAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): boolean {
-    throw 'not implemented';
-  }
-  getAttribute(element: any /** TODO #9100 */, attribute: string): string {
+  hasAttributeNS(element: any, ns: string, attribute: string): boolean { throw 'not implemented'; }
+  getAttribute(element: any, attribute: string): string {
     return element.attribs && element.attribs.hasOwnProperty(attribute) ?
         element.attribs[attribute] :
         null;
   }
-  getAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): string {
-    throw 'not implemented';
-  }
-  setAttribute(element: any /** TODO #9100 */, attribute: string, value: string) {
+  getAttributeNS(element: any, ns: string, attribute: string): string { throw 'not implemented'; }
+  setAttribute(element: any, attribute: string, value: string) {
     if (attribute) {
       element.attribs[attribute] = value;
       if (attribute === 'class') {
@@ -484,57 +457,46 @@ export class Parse5DomAdapter extends DomAdapter {
       }
     }
   }
-  setAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string, value: string) {
+  setAttributeNS(element: any, ns: string, attribute: string, value: string) {
     throw 'not implemented';
   }
-  removeAttribute(element: any /** TODO #9100 */, attribute: string) {
+  removeAttribute(element: any, attribute: string) {
     if (attribute) {
-      StringMapWrapper.delete(element.attribs, attribute);
+      delete element.attribs[attribute];
     }
   }
-  removeAttributeNS(element: any /** TODO #9100 */, ns: string, name: string) {
-    throw 'not implemented';
-  }
-  templateAwareRoot(el: any /** TODO #9100 */): any {
-    return this.isTemplateElement(el) ? this.content(el) : el;
+  removeAttributeNS(element: any, ns: string, name: string) { throw 'not implemented'; }
+  templateAwareRoot(el: any): any {
+    return this.isTemplateElement(el) ? treeAdapter.getTemplateContent(el) : el;
   }
   createHtmlDocument(): Document {
-    var newDoc = treeAdapter.createDocument();
+    const newDoc = treeAdapter.createDocument();
     newDoc.title = 'fake title';
-    var head = treeAdapter.createElement('head', null, []);
-    var body = treeAdapter.createElement('body', 'http://www.w3.org/1999/xhtml', []);
+    const head = treeAdapter.createElement('head', null, []);
+    const body = treeAdapter.createElement('body', 'http://www.w3.org/1999/xhtml', []);
     this.appendChild(newDoc, head);
     this.appendChild(newDoc, body);
-    StringMapWrapper.set(newDoc, 'head', head);
-    StringMapWrapper.set(newDoc, 'body', body);
-    StringMapWrapper.set(newDoc, '_window', StringMapWrapper.create());
+    newDoc['head'] = head;
+    newDoc['body'] = body;
+    newDoc['_window'] = {};
     return newDoc;
   }
-  defaultDoc(): Document {
-    if (defDoc === null) {
-      defDoc = this.createHtmlDocument();
-    }
-    return defDoc;
-  }
-  getBoundingClientRect(el: any /** TODO #9100 */): any {
-    return {left: 0, top: 0, width: 0, height: 0};
-  }
+  defaultDoc(): Document { return defDoc = defDoc || this.createHtmlDocument(); }
+  getBoundingClientRect(el: any): any { return {left: 0, top: 0, width: 0, height: 0}; }
   getTitle(): string { return this.defaultDoc().title || ''; }
   setTitle(newTitle: string) { this.defaultDoc().title = newTitle; }
   isTemplateElement(el: any): boolean {
     return this.isElementNode(el) && this.tagName(el) === 'template';
   }
-  isTextNode(node: any /** TODO #9100 */): boolean { return treeAdapter.isTextNode(node); }
-  isCommentNode(node: any /** TODO #9100 */): boolean { return treeAdapter.isCommentNode(node); }
-  isElementNode(node: any /** TODO #9100 */): boolean {
-    return node ? treeAdapter.isElementNode(node) : false;
-  }
-  hasShadowRoot(node: any /** TODO #9100 */): boolean { return isPresent(node.shadowRoot); }
-  isShadowRoot(node: any /** TODO #9100 */): boolean { return this.getShadowRoot(node) == node; }
-  importIntoDoc(node: any /** TODO #9100 */): any { return this.clone(node); }
-  adoptNode(node: any /** TODO #9100 */): any { return node; }
-  getHref(el: any /** TODO #9100 */): string { return el.href; }
-  resolveAndSetHref(el: any /** TODO #9100 */, baseUrl: string, href: string) {
+  isTextNode(node: any): boolean { return treeAdapter.isTextNode(node); }
+  isCommentNode(node: any): boolean { return treeAdapter.isCommentNode(node); }
+  isElementNode(node: any): boolean { return node ? treeAdapter.isElementNode(node) : false; }
+  hasShadowRoot(node: any): boolean { return isPresent(node.shadowRoot); }
+  isShadowRoot(node: any): boolean { return this.getShadowRoot(node) == node; }
+  importIntoDoc(node: any): any { return this.clone(node); }
+  adoptNode(node: any): any { return node; }
+  getHref(el: any): string { return el.href; }
+  resolveAndSetHref(el: any, baseUrl: string, href: string) {
     if (href == null) {
       el.href = baseUrl;
     } else {
@@ -542,37 +504,35 @@ export class Parse5DomAdapter extends DomAdapter {
     }
   }
   /** @internal */
-  _buildRules(parsedRules: any /** TODO #9100 */, css?: any /** TODO #9100 */) {
-    var rules: any[] /** TODO #9100 */ = [];
-    for (var i = 0; i < parsedRules.length; i++) {
-      var parsedRule = parsedRules[i];
-      var rule: {[key: string]: any} = StringMapWrapper.create();
-      StringMapWrapper.set(rule, 'cssText', css);
-      StringMapWrapper.set(rule, 'style', {content: '', cssText: ''});
+  _buildRules(parsedRules: any, css?: any) {
+    const rules: any[] = [];
+    for (let i = 0; i < parsedRules.length; i++) {
+      const parsedRule = parsedRules[i];
+      const rule: {[key: string]: any} = {};
+      rule['cssText'] = css;
+      rule['style'] = {content: '', cssText: ''};
       if (parsedRule.type == 'rule') {
-        StringMapWrapper.set(rule, 'type', 1);
-        StringMapWrapper.set(
-            rule, 'selectorText', parsedRule.selectors.join(', ')
-                                      .replace(/\s{2,}/g, ' ')
-                                      .replace(/\s*~\s*/g, ' ~ ')
-                                      .replace(/\s*\+\s*/g, ' + ')
-                                      .replace(/\s*>\s*/g, ' > ')
-                                      .replace(/\[(\w+)=(\w+)\]/g, '[$1="$2"]'));
+        rule['type'] = 1;
+
+        rule['selectorText'] =
+            parsedRule.selectors.join(', '.replace(/\s{2,}/g, ' ')
+                                          .replace(/\s*~\s*/g, ' ~ ')
+                                          .replace(/\s*\+\s*/g, ' + ')
+                                          .replace(/\s*>\s*/g, ' > ')
+                                          .replace(/\[(\w+)=(\w+)\]/g, '[$1="$2"]'));
         if (isBlank(parsedRule.declarations)) {
           continue;
         }
-        for (var j = 0; j < parsedRule.declarations.length; j++) {
-          var declaration = parsedRule.declarations[j];
-          StringMapWrapper.set(
-              StringMapWrapper.get(rule, 'style'), declaration.property, declaration.value);
-          StringMapWrapper.get(rule, 'style').cssText +=
-              declaration.property + ': ' + declaration.value + ';';
+        for (let j = 0; j < parsedRule.declarations.length; j++) {
+          const declaration = parsedRule.declarations[j];
+          rule['style'] = declaration.property[declaration.value];
+          rule['style'].cssText += declaration.property + ': ' + declaration.value + ';';
         }
       } else if (parsedRule.type == 'media') {
-        StringMapWrapper.set(rule, 'type', 4);
-        StringMapWrapper.set(rule, 'media', {mediaText: parsedRule.media});
+        rule['type'] = 4;
+        rule['media'] = {mediaText: parsedRule.media};
         if (parsedRule.rules) {
-          StringMapWrapper.set(rule, 'cssRules', this._buildRules(parsedRule.rules));
+          rule['cssRules'] = this._buildRules(parsedRule.rules);
         }
       }
       rules.push(rule);
@@ -595,28 +555,21 @@ export class Parse5DomAdapter extends DomAdapter {
   getHistory(): History { throw 'not implemented'; }
   getLocation(): Location { throw 'not implemented'; }
   getUserAgent(): string { return 'Fake user agent'; }
-  getData(el: any /** TODO #9100 */, name: string): string {
-    return this.getAttribute(el, 'data-' + name);
-  }
-  getComputedStyle(el: any /** TODO #9100 */): any { throw 'not implemented'; }
-  setData(el: any /** TODO #9100 */, name: string, value: string) {
-    this.setAttribute(el, 'data-' + name, value);
-  }
+  getData(el: any, name: string): string { return this.getAttribute(el, 'data-' + name); }
+  getComputedStyle(el: any): any { throw 'not implemented'; }
+  setData(el: any, name: string, value: string) { this.setAttribute(el, 'data-' + name, value); }
   // TODO(tbosch): move this into a separate environment class once we have it
   setGlobalVar(path: string, value: any) { setValueOnPath(global, path, value); }
   supportsWebAnimation(): boolean { return false; }
-  performanceNow(): number { return DateWrapper.toMillis(DateWrapper.now()); }
+  performanceNow(): number { return Date.now(); }
   getAnimationPrefix(): string { return ''; }
   getTransitionEnd(): string { return 'transitionend'; }
   supportsAnimation(): boolean { return true; }
 
-  replaceChild(
-      el: any /** TODO #9100 */, newNode: any /** TODO #9100 */, oldNode: any /** TODO #9100 */) {
-    throw new Error('not implemented');
-  }
+  replaceChild(el: any, newNode: any, oldNode: any) { throw new Error('not implemented'); }
   parse(templateHtml: string) { throw new Error('not implemented'); }
   invoke(el: Element, methodName: string, args: any[]): any { throw new Error('not implemented'); }
-  getEventKey(event: any /** TODO #9100 */): string { throw new Error('not implemented'); }
+  getEventKey(event: any): string { throw new Error('not implemented'); }
 
   supportsCookies(): boolean { return false; }
   getCookie(name: string): string { throw new Error('not implemented'); }
@@ -625,7 +578,7 @@ export class Parse5DomAdapter extends DomAdapter {
 }
 
 // TODO: build a proper list, this one is all the keys of a HTMLInputElement
-var _HTMLElementPropertyList = [
+const _HTMLElementPropertyList = [
   'webkitEntries',
   'incremental',
   'webkitdirectory',
@@ -807,5 +760,5 @@ var _HTMLElementPropertyList = [
   'nodeValue',
   'nodeName',
   'closure_lm_714617',
-  '__jsaction'
+  '__jsaction',
 ];
diff --git a/nativescript-angular/private_import_core.ts b/nativescript-angular/private_import_core.ts
index 48a3322b5..f2512b86f 100644
--- a/nativescript-angular/private_import_core.ts
+++ b/nativescript-angular/private_import_core.ts
@@ -13,9 +13,6 @@ export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo;
 
 export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities;
 
-export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES =
-    r.VIEW_ENCAPSULATION_VALUES;
-
 export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer;
 export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer;
 export var reflector: typeof r.reflector = r.reflector;
diff --git a/ng-sample/package.json b/ng-sample/package.json
index 862c50b71..b62ddfc5e 100644
--- a/ng-sample/package.json
+++ b/ng-sample/package.json
@@ -26,23 +26,22 @@
     "tns-core-modules": "2.2.1",
     "nativescript-angular": "file:../nativescript-angular",
     "nativescript-intl": "^0.0.4",
-    "@angular/core": "2.0.1",
-    "@angular/common": "2.0.1",
-    "@angular/compiler": "2.0.1",
-    "@angular/http": "2.0.1",
-    "@angular/platform-browser": "2.0.1",
-    "@angular/platform-browser-dynamic": "2.0.1",
-    "@angular/platform-server": "2.0.1",
-    "@angular/router": "3.0.1",
+    "@angular/core": "~2.0.0",
+    "@angular/common": "~2.0.0",
+    "@angular/compiler": "~2.0.0",
+    "@angular/http": "~2.0.0",
+    "@angular/platform-browser": "~2.0.0",
+    "@angular/platform-browser-dynamic": "~2.0.0",
+    "@angular/router": "~3.0.0",
     "rxjs": "5.0.0-beta.12",
-    "reflect-metadata": "^0.1.8",
+    "reflect-metadata": "~0.1.8",
     "parse5": "1.3.2",
     "punycode": "1.3.2",
     "querystring": "0.2.0",
     "url": "0.10.3"
   },
   "devDependencies": {
-    "zone.js": "^0.6.21",
+    "zone.js": "~0.6.21",
     "babel-traverse": "6.9.0",
     "babel-types": "6.10.0",
     "babylon": "6.8.1",
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
index fb81a147c..d8d68d020 100644
--- a/tests/app/tests/modal-dialog.ts
+++ b/tests/app/tests/modal-dialog.ts
@@ -77,7 +77,7 @@ describe('modal-dialog', () => {
         testApp.loadComponent(FailComponent)
             .then((ref) => {
                 const service = <ModalDialogService>ref.instance.service;
-                assert.throws(() => service.showModal(ModalComponent, {}), "No viewContainerRef: Make sure you have the modal-dialog-host directive inside your component.");
+                assert.throws(() => service.showModal(ModalComponent, {}), "No viewContainerRef: Make sure you pass viewContainerRef in ModalDialogOptions.");
             }).then(() => done(), err => done(err));
     });
 
diff --git a/tests/package.json b/tests/package.json
index 4e99b80bc..d8a1dae6c 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -26,23 +26,22 @@
         "nativescript-unit-test-runner": "^0.3.3",
         "tns-core-modules": "2.3.0",
         "nativescript-angular": "file:../nativescript-angular",
-        "@angular/core": "2.0.1",
-        "@angular/common": "2.0.1",
-        "@angular/compiler": "2.0.1",
-        "@angular/http": "2.0.1",
-        "@angular/platform-browser": "2.0.1",
-        "@angular/platform-browser-dynamic": "2.0.1",
-        "@angular/platform-server": "2.0.1",
-        "@angular/router": "3.0.1",
+        "@angular/core": "~2.0.0",
+        "@angular/common": "~2.0.0",
+        "@angular/compiler": "~2.0.0",
+        "@angular/http": "~2.0.0",
+        "@angular/platform-browser": "~2.0.0",
+        "@angular/platform-browser-dynamic": "~2.0.0",
+        "@angular/router": "~3.0.0",
         "rxjs": "5.0.0-beta.12",
-        "reflect-metadata": "^0.1.8",
+        "reflect-metadata": "~0.1.8",
         "parse5": "1.3.2",
         "punycode": "1.3.2",
         "querystring": "0.2.0",
         "url": "0.10.3"
     },
     "devDependencies": {
-        "zone.js": "^0.6.21",
+        "zone.js": "~0.6.21",
         "babel-traverse": "6.8.0",
         "babel-types": "6.8.1",
         "babylon": "6.8.0",
@@ -60,6 +59,8 @@
         "nativescript-dev-appium": "^0.0.13",
         "nativescript-dev-typescript": "^0.3.1",
         "typescript": "^1.8.10",
+        "socket.io": "1.4.8",
+        "socket.io-client": "1.4.8",
         "wd": "0.4.0"
     },
     "scripts": {
@@ -68,4 +69,4 @@
         "run-appium-android": "nativescript-dev-appium android",
         "appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator"
     }
-}
+}
\ No newline at end of file