updates to integrate with Angular spike