Model refactored