Fixing Registry API