Use Optional in the Registry API.
Allow InjectionHandler to inject optionals.