diff --git a/Medianno/MADocument.xcdatamodeld/MADocument.xcdatamodel/contents b/Medianno/MADocument.xcdatamodeld/MADocument.xcdatamodel/contents
index 1816625..44e4d8d 100644
--- a/Medianno/MADocument.xcdatamodeld/MADocument.xcdatamodel/contents
+++ b/Medianno/MADocument.xcdatamodeld/MADocument.xcdatamodel/contents
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="562" systemVersion="11A511" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="MAAnno" representedClassName="MAAnno">
-        <attribute name="location" optional="YES" attributeType="String"/>
-        <attribute name="notes" optional="YES" attributeType="String"/>
-        <relationship name="media" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAMedia" inverseName="annotations" inverseEntity="MAMedia"/>
+        <attribute name="location" attributeType="String"/>
+        <attribute name="notes" attributeType="String"/>
+        <relationship name="media" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAMedia" inverseName="annotations" inverseEntity="MAMedia"/>
         <relationship name="tags" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="MATag" inverseName="annotation" inverseEntity="MATag"/>
     </entity>
     <entity name="MAFolder" representedClassName="MAFolder">
-        <attribute name="name" optional="YES" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
         <relationship name="children" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="MAFolder" inverseName="parent" inverseEntity="MAFolder"/>
         <relationship name="contents" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="MAMedia" inverseName="folder" inverseEntity="MAMedia"/>
         <relationship name="parent" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAFolder" inverseName="children" inverseEntity="MAFolder"/>
     </entity>
     <entity name="MAMedia" representedClassName="MAMedia">
-        <attribute name="date" optional="YES" attributeType="Date"/>
-        <attribute name="media" optional="YES" attributeType="String"/>
-        <attribute name="notes" optional="YES" attributeType="String"/>
+        <attribute name="date" attributeType="Date"/>
+        <attribute name="media" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="notes" attributeType="String"/>
         <relationship name="annotations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="MAAnno" inverseName="media" inverseEntity="MAAnno"/>
-        <relationship name="folder" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAFolder" inverseName="contents" inverseEntity="MAFolder"/>
+        <relationship name="folder" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAFolder" inverseName="contents" inverseEntity="MAFolder"/>
     </entity>
     <entity name="MATag" representedClassName="MATag">
-        <relationship name="annotation" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAAnno" inverseName="tags" inverseEntity="MAAnno"/>
-        <relationship name="tag" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MATagDescription" inverseName="uses" inverseEntity="MATagDescription"/>
+        <relationship name="annotation" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MAAnno" inverseName="tags" inverseEntity="MAAnno"/>
+        <relationship name="tag" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MATagDescription" inverseName="uses" inverseEntity="MATagDescription"/>
     </entity>
     <entity name="MATagDescription" representedClassName="MATagDescription">
-        <attribute name="name" optional="YES" attributeType="String"/>
+        <attribute name="name" attributeType="String"/>
         <attribute name="notes" optional="YES" attributeType="String"/>
         <relationship name="uses" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="MATag" inverseName="tag" inverseEntity="MATag"/>
     </entity>
     <elements>
-        <element name="MAMedia" positionX="-1116" positionY="-882" width="128" height="120"/>
+        <element name="MAMedia" positionX="-1116" positionY="-882" width="128" height="135"/>
         <element name="MATagDescription" positionX="-866" positionY="-576" width="128" height="90"/>
         <element name="MAAnno" positionX="-1296" positionY="-585" width="128" height="105"/>
         <element name="MAFolder" positionX="-864" positionY="-873" width="180" height="105"/>
diff --git a/Medianno/MAMedia.h b/Medianno/MAMedia.h
index a92f60e..a383996 100644
--- a/Medianno/MAMedia.h
+++ b/Medianno/MAMedia.h
@@ -15,6 +15,7 @@
 @private
 }
 @property (nonatomic, retain) NSString * media;
+@property (nonatomic, retain) NSString * name;
 @property (nonatomic) NSTimeInterval date;
 @property (nonatomic, retain) NSString * notes;
 @property (nonatomic, retain) NSSet *annotations;
diff --git a/Medianno/MAMedia.mm b/Medianno/MAMedia.mm
index 4ec3787..eba76e6 100644
--- a/Medianno/MAMedia.mm
+++ b/Medianno/MAMedia.mm
@@ -13,6 +13,7 @@
 
 @implementation MAMedia
 @dynamic media;
+@dynamic name;
 @dynamic date;
 @dynamic notes;
 @dynamic annotations;