Some more work on async API