Refactorized Model