Model Refactoring(but need to clean db)