Redo the registration mechanism