Refactoring: use model class instead