Improving the async loading