Refactored ModelList and Model