Utilizes the logic from the registrar and the factory bean. The changes to them have been made minimal invasive. Fixes gh-42