Model class refactoring