changed handlers to export the registered instance