Added async mode