Update for recent mongo changes