Response refactoring