Refactored async resolver code flow

Done