Models refactored