Refactor responders