Added latest angular stuffs from djz-sai