Add response (+ headers) in separate class