Now using getRegistry() rather than createRegistry()