Added changes for angular-unstable