Refactor update_responses