Various changes regarding angular integration