Continues AngularJS migration