Added fields and MongoId support