Adds async mode
Merged