Refactor registrations to use classes & methods.