Refactor response, dispatcher