Adding response-wait parser