diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
index 3490f7f5..4f17e4e2 100644
--- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -63,7 +63,7 @@
 		DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; };
 		DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; };
 		DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; };
-		DA0CC54E1EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */; };
+		DA0CC5401EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */; };
 		DA0CC58C1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5791EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m */; };
 		DA0CC58D1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57B1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m */; };
 		DA0CC58E1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57D1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m */; };
@@ -3624,7 +3624,7 @@
 				DA0CC58F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m in Sources */,
 				93D396D8B67DA6522CDBA142 /* MPCoachmarkViewController.m in Sources */,
 				DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */,
-				DA0CC54E1EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */,
+				DA0CC5401EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */,
 				DA35148D233EF93400BCF504 /* mpw-algorithm_v3.c in Sources */,
 				DAB07C9D1F7725C500CC6D43 /* aes.c in Sources */,
 				93D39EAA4D064193074D3021 /* MPFixable.m in Sources */,
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 1.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 1.xcdatamodel/contents
index 68a117df..80e24be2 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 1.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 1.xcdatamodel/contents	
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6244" systemVersion="13E28" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPElementEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPElementGeneratedEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPElementEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPElementStoredEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPElementEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity"/>
     </entity>
     <elements>
         <element name="MPElementEntity" positionX="160" positionY="192" width="128" height="135"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 2.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 2.xcdatamodel/contents
index f13a64fc..c6d7620f 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 2.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 2.xcdatamodel/contents	
@@ -1,35 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6244" systemVersion="13E28" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPElementEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="userName" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="userName" optional="YES" attributeType="String"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPElementGeneratedEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPElementEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPElementStoredEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPElementEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" transient="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="requiresExplicitMigration_" transient="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity"/>
     </entity>
     <elements>
         <element name="MPElementEntity" positionX="0" positionY="0" width="128" height="180"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents
index b6bdbd0f..ed2092cf 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents	
@@ -1,35 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6244" systemVersion="13E28" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPElementEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPElementGeneratedEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPElementEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPElementStoredEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPElementEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" transient="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="requiresExplicitMigration_" transient="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="178"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 4.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 4.xcdatamodel/contents
index ce674890..818b3faa 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 4.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 4.xcdatamodel/contents	
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6244" systemVersion="13E28" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPElementEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPElementGeneratedEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPElementEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPElementStoredEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPElementEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="178"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 5.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 5.xcdatamodel/contents
index 0ccbdbd8..6048cca3 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 5.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 5.xcdatamodel/contents	
@@ -1,35 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6244" systemVersion="13E28" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPElementStoredEntity" representedClassName="MPElementStoredEntity" parentEntity="MPElementEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="193"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 6.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 6.xcdatamodel/contents
index 7c5f7ca9..b6db41e4 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 6.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 6.xcdatamodel/contents	
@@ -1,40 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6254" systemVersion="14C109" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPGeneratedSiteEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPSiteEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPSiteEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPSiteQuestionEntity" representedClassName="MPSiteQuestionEntity" syncable="YES">
-        <attribute name="keyword" attributeType="String" syncable="YES"/>
-        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity" syncable="YES"/>
+        <attribute name="keyword" attributeType="String"/>
+        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity"/>
     </entity>
     <entity name="MPStoredSiteEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPSiteEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPGeneratedSiteEntity" positionX="216" positionY="-288" width="128" height="58"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 7.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 7.xcdatamodel/contents
index 536886aa..09b93a55 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 7.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 7.xcdatamodel/contents	
@@ -1,41 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6254" systemVersion="14C109" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPGeneratedSiteEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPSiteEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPSiteEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPSiteQuestionEntity" representedClassName="MPSiteQuestionEntity" syncable="YES">
-        <attribute name="keyword" attributeType="String" syncable="YES"/>
-        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity" syncable="YES"/>
+        <attribute name="keyword" attributeType="String"/>
+        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity"/>
     </entity>
     <entity name="MPStoredSiteEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPSiteEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" syncable="YES"/>
-        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" usesScalarValueType="NO"/>
+        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPGeneratedSiteEntity" positionX="216" positionY="-288" width="128" height="58"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 8.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 8.xcdatamodel/contents
index e8f23eb7..cfbc27cc 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 8.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 8.xcdatamodel/contents	
@@ -1,44 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9525" systemVersion="15C50" minimumToolsVersion="Automatic">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPGeneratedSiteEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPSiteEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPSiteEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
-        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
-        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPSiteQuestionEntity" representedClassName="MPSiteQuestionEntity" syncable="YES">
-        <attribute name="keyword" attributeType="String" syncable="YES"/>
-        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity" syncable="YES"/>
+        <attribute name="keyword" attributeType="String"/>
+        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity"/>
     </entity>
     <entity name="MPStoredSiteEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPSiteEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="touchID_" attributeType="Boolean" defaultValueString="0">
-            <userInfo/>
-        </attribute>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" syncable="YES"/>
-        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="touchID_" attributeType="Boolean" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" usesScalarValueType="NO"/>
+        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPGeneratedSiteEntity" positionX="216" positionY="-288" width="128" height="58"/>
diff --git a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 9.xcdatamodel/contents b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 9.xcdatamodel/contents
index edc3212a..8b261183 100644
--- a/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 9.xcdatamodel/contents	
+++ b/platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 9.xcdatamodel/contents	
@@ -1,57 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16E195" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17189" systemVersion="19G73" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="MPGeneratedSiteEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPSiteEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
-        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO"/>
     </entity>
     <entity name="MPSiteEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
-        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
-        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
-        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
-        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
-        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="url" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity" syncable="YES"/>
-        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
-        <compoundIndexes>
-            <compoundIndex>
-                <index value="name"/>
-                <index value="user"/>
-            </compoundIndex>
-        </compoundIndexes>
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51"/>
+        <attribute name="name" attributeType="String" minValueString="1"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="url" optional="YES" attributeType="String"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF"/>
+        <fetchIndex name="byLastUsedIndex">
+            <fetchIndexElement property="lastUsed" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byNameIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="byUses_Index">
+            <fetchIndexElement property="uses_" type="Binary" order="ascending"/>
+        </fetchIndex>
+        <fetchIndex name="compoundIndex">
+            <fetchIndexElement property="name" type="Binary" order="ascending"/>
+            <fetchIndexElement property="user" type="Binary" order="ascending"/>
+        </fetchIndex>
     </entity>
     <entity name="MPSiteQuestionEntity" representedClassName="MPSiteQuestionEntity" syncable="YES">
-        <attribute name="keyword" attributeType="String" syncable="YES"/>
-        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity" syncable="YES"/>
+        <attribute name="keyword" attributeType="String"/>
+        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity"/>
     </entity>
     <entity name="MPStoredSiteEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPSiteEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
-        <attribute name="contentObject" optional="YES" attributeType="Transformable" customClassName="NSData" storedInTruthFile="YES" syncable="YES"/>
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromDataTransformer" customClassName="NSData" storedInTruthFile="YES"/>
     </entity>
     <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
-        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="touchID_" attributeType="Boolean" defaultValueString="0" usesScalarValueType="NO">
-            <userInfo/>
-        </attribute>
-        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <attribute name="name" attributeType="String"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="touchID_" attributeType="Boolean" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" usesScalarValueType="NO"/>
+        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC"/>
     </entity>
     <elements>
         <element name="MPGeneratedSiteEntity" positionX="216" positionY="-288" width="128" height="58"/>
         <element name="MPSiteEntity" positionX="-0" positionY="-286" width="128" height="225"/>
         <element name="MPSiteQuestionEntity" positionX="-2" positionY="-9" width="128" height="73"/>
-        <element name="MPStoredSiteEntity" positionX="214" positionY="-171" width="128" height="60"/>
+        <element name="MPStoredSiteEntity" positionX="214" positionY="-171" width="128" height="58"/>
         <element name="MPUserEntity" positionX="-218" positionY="-288" width="128" height="178"/>
     </elements>
 </model>
\ No newline at end of file