Added Angular support