Updated to comply with changes in ngModel