Bit more update_responses refactoring