Added response handling