Modifications for MongoDB