Renamed HandlerRegistration to Registration