Angular improvements

Change-Id: Ic93ea8fe366ed2128f4380900cad24035afa5cfe