Refactored registry to simply hang in custom repository or interpolator