Added async feature