- Refactored ModelHelper