Improved MongoSource