Model refactorization