Response factory refactor