refactored Model Data