Some more refactoring. Remove ng-change and add specific watch