Updated angular integration