Added more angular stuff