Refactoring and Model Changes