Switch to es6-promise