Use  instead of ES6 promises for now