Adding in more angular support