MOD: add angular support