Add make_wrapped_handler