Update to reflect ES6 Promise API