Improve async support