Request response refactor