Conform to new -core changes.
Changed HandlerRegistration to the more generic Registration.