Refactored Data.MongoDb