Update to use bluebird