Simplify registry to just use uids and hashed keys; additional error handling