Use es6-promise instead of bluebird