Migrated to bluebird promises