+ UpdateResponse, refactoring