Added basic angular support