Refactored MongodbStore