Model Package Refactored