Adding AngularJs support