diff --git a/CoreDataStack/Entity/Application.swift b/CoreDataStack/Entity/Application.swift
index cfbf48f7..c9aa2283 100644
--- a/CoreDataStack/Entity/Application.swift
+++ b/CoreDataStack/Entity/Application.swift
@@ -24,7 +24,7 @@ public final class Application: NSManagedObject {
 public extension Application {
     override func awakeFromInsert() {
         super.awakeFromInsert()
-        identifier = UUID()
+        setPrimitiveValue(UUID(), forKey: #keyPath(Application.identifier))
     }
 
     @discardableResult
diff --git a/CoreDataStack/Entity/Attachment.swift b/CoreDataStack/Entity/Attachment.swift
index f3071872..e580014c 100644
--- a/CoreDataStack/Entity/Attachment.swift
+++ b/CoreDataStack/Entity/Attachment.swift
@@ -36,7 +36,7 @@ public extension Attachment {
     
     override func awakeFromInsert() {
         super.awakeFromInsert()
-        createdAt = Date()
+        setPrimitiveValue(Date(), forKey: #keyPath(Attachment.createdAt))
     }
     
     @discardableResult
diff --git a/CoreDataStack/Entity/Emoji.swift b/CoreDataStack/Entity/Emoji.swift
index f43dcbf4..933baab9 100644
--- a/CoreDataStack/Entity/Emoji.swift
+++ b/CoreDataStack/Entity/Emoji.swift
@@ -26,7 +26,7 @@ public final class Emoji: NSManagedObject {
 public extension Emoji {
     override func awakeFromInsert() {
         super.awakeFromInsert()
-        identifier = UUID()
+        setPrimitiveValue(UUID(), forKey: #keyPath(Emoji.identifier))
     }
 
     @discardableResult
diff --git a/CoreDataStack/Entity/History.swift b/CoreDataStack/Entity/History.swift
index 66493368..552e2a40 100644
--- a/CoreDataStack/Entity/History.swift
+++ b/CoreDataStack/Entity/History.swift
@@ -24,7 +24,7 @@ public final class History: NSManagedObject {
 public extension History {
     override func awakeFromInsert() {
         super.awakeFromInsert()
-        identifier = UUID()
+        setPrimitiveValue(UUID(), forKey: #keyPath(History.identifier))
     }
 
     @discardableResult
diff --git a/CoreDataStack/Entity/MastodonAuthentication.swift b/CoreDataStack/Entity/MastodonAuthentication.swift
index e58c2e87..0ee0e343 100644
--- a/CoreDataStack/Entity/MastodonAuthentication.swift
+++ b/CoreDataStack/Entity/MastodonAuthentication.swift
@@ -36,12 +36,12 @@ extension MastodonAuthentication {
     
     public override func awakeFromInsert() {
         super.awakeFromInsert()
-        identifier = UUID()
         
+        setPrimitiveValue(UUID(), forKey: #keyPath(MastodonAuthentication.identifier))
         let now = Date()
-        createdAt = now
-        updatedAt = now
-        activedAt = now
+        setPrimitiveValue(now, forKey: #keyPath(MastodonAuthentication.createdAt))
+        setPrimitiveValue(now, forKey: #keyPath(MastodonAuthentication.updatedAt))
+        setPrimitiveValue(now, forKey: #keyPath(MastodonAuthentication.activedAt))
     }
     
     @discardableResult
diff --git a/CoreDataStack/Entity/Mention.swift b/CoreDataStack/Entity/Mention.swift
index caec10d3..e659cf89 100644
--- a/CoreDataStack/Entity/Mention.swift
+++ b/CoreDataStack/Entity/Mention.swift
@@ -25,7 +25,8 @@ public final class Mention: NSManagedObject {
 public extension Mention {
     override func awakeFromInsert() {
         super.awakeFromInsert()
-        identifier = UUID()
+        
+        setPrimitiveValue(UUID(), forKey: #keyPath(Mention.identifier))
     }
 
     @discardableResult
diff --git a/CoreDataStack/Entity/Poll.swift b/CoreDataStack/Entity/Poll.swift
index cc5e7bbc..356f2fc2 100644
--- a/CoreDataStack/Entity/Poll.swift
+++ b/CoreDataStack/Entity/Poll.swift
@@ -35,7 +35,7 @@ extension Poll {
     
     public override func awakeFromInsert() {
         super.awakeFromInsert()
-        createdAt = Date()
+        setPrimitiveValue(Date(), forKey: #keyPath(Poll.createdAt))
     }
     
     @discardableResult
diff --git a/CoreDataStack/Entity/PollOption.swift b/CoreDataStack/Entity/PollOption.swift
index f9a3ce95..8917a753 100644
--- a/CoreDataStack/Entity/PollOption.swift
+++ b/CoreDataStack/Entity/PollOption.swift
@@ -27,7 +27,7 @@ extension PollOption {
     
     public override func awakeFromInsert() {
         super.awakeFromInsert()
-        createdAt = Date()
+        setPrimitiveValue(Date(), forKey: #keyPath(PollOption.createdAt))
     }
     
     @discardableResult
diff --git a/CoreDataStack/Entity/Tag.swift b/CoreDataStack/Entity/Tag.swift
index 3f5d2bca..d817c774 100644
--- a/CoreDataStack/Entity/Tag.swift
+++ b/CoreDataStack/Entity/Tag.swift
@@ -26,7 +26,7 @@ public final class Tag: NSManagedObject {
 extension Tag {
     public override func awakeFromInsert() {
         super.awakeFromInsert()
-        identifier = UUID()
+        setPrimitiveValue(UUID(), forKey: #keyPath(Tag.identifier))
     }
     
     @discardableResult
diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index 7f54faa3..747fe7df 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>CoreDataStack.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>7</integer>
 		</dict>
 		<key>Mastodon - RTL.xcscheme_^#shared#^_</key>
 		<dict>
@@ -22,31 +22,10 @@
 		<key>Mastodon.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>12</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>DB427DD125BAA00100D1B89D</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>DB427DE725BAA00100D1B89D</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>DB427DF225BAA00100D1B89D</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>DB89B9F525C10FD0008580ED</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
+	<dict/>
 </dict>
 </plist>