Added support to async methods