Let's switch it to FactoryRegistry for 1.6