Updated in line with switch to Mongo.