Refactor in async load