Refactor to use new async callback builders