Angular support added