Adapted model refactoring section