Add support to category and category attributes; Included AngularJS support;