Adding Angular support