Some changes for async