Response refactor