Conflict
Refactor responder to include handler