Updated async behavior