Updated to use MongoClient