Adds asynchronous support