Update for mongodb-2.6