Switch to use centralized package loader