Fixed Async functionality