Added async returns support