Unified the Registry