(#23) Angular support