refactoring, model added