more robust registry