Model refactored.