added bijective map, changed clientregistry to use it