added angular support