Switched to Promise-based flow.