Finished model refactoring