Improvement for asynchronous calls