Rename #register_record to #add_record
Refactor smelling rewrite retry handling