Async and refactoring