Refactor responder to include handler