Adding response handling