Moving to cleaner all-async API
Moving to cleaner all-async API