Refactored model dependencies