Refactored Model to not duplicate code