Add asynchronous resolving