This commit review the API using a builder to make it more clear what the registrar does. Closes gh-29161