Made async call explicit.
Cleaned up API.