Restructured calls to use async