Refactoring - model