Added asynchronous feature