Modifications to support  of angular better