Improving Mongo.Entity structure