Adjusted to refactored registrar.