Refactored type registry dependency