Angular usage improvements