Simplify registry logic