More work on the registry