Remove Wait() and make API fully Async