Separate synchronous and asynchronous support