Fixed model for refactored code