Model Updates and Refactoring