diff --git a/CHANGELOG.md b/CHANGELOG.md
index 928ea9b9..5b9460fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ _None._
 
 ### Breaking Changes
 
-- Re-implement a few reader model types in Swift. [#556]
+- Re-implement a few reader model types in Swift. [#556, #557, #558]
 
 ### New Features
 
diff --git a/WordPressKit/RemoteBlog.swift b/WordPressKit/RemoteBlog.swift
index bebc67e3..c468deeb 100644
--- a/WordPressKit/RemoteBlog.swift
+++ b/WordPressKit/RemoteBlog.swift
@@ -5,31 +5,31 @@ import NSObject_SafeExpectations
 @objcMembers public class RemoteBlog: NSObject {
 
     /// The ID of the Blog entity.
-    public var blogID: NSNumber?
+    public var blogID: NSNumber!
 
     /// The organization ID of the Blog entity.
-    public var organizationID: NSNumber?
+    public var organizationID: NSNumber!
 
     /// Represents the Blog Name.
-    public var name: String?
+    public var name: String!
 
     /// Description of the WordPress Blog.
-    public var tagline: String?
+    public var tagline: String!
 
     /// Represents the Blog Name.
-    public var url: String?
+    public var url: String!
 
     /// Maps to the XMLRPC endpoint.
-    public var xmlrpc: String?
+    public var xmlrpc: String!
 
     /// Site Icon's URL.
-    public var icon: String?
+    public var icon: String!
 
     /// Product ID of the site's current plan, if it has one.
-    public var planID: NSNumber?
+    public var planID: NSNumber!
 
     /// Product name of the site's current plan, if it has one.
-    public var planTitle: String?
+    public var planTitle: String!
 
     /// Indicates whether the current's blog plan is paid, or not.
     public var hasPaidPlan: Bool = false
@@ -44,16 +44,16 @@ import NSObject_SafeExpectations
     public var visible: Bool = false
 
     /// Blog's options preferences.
-    public var options: NSDictionary?
+    public var options: NSDictionary!
 
     /// Blog's capabilities: Indicate which actions are allowed / not allowed, for the current user.
-    public var capabilities: NSDictionary?
+    public var capabilities: NSDictionary!
 
     /// Blog's total disk quota space.
-    public var quotaSpaceAllowed: NSNumber?
+    public var quotaSpaceAllowed: NSNumber!
 
     /// Blog's total disk quota space used.
-    public var quotaSpaceUsed: NSNumber?
+    public var quotaSpaceUsed: NSNumber!
 
     /// Parses details from a JSON dictionary, as returned by the WordPress.com REST API.
     public init(JSONDictionary json: NSDictionary) {
diff --git a/WordPressKit/RemoteReaderSite.swift b/WordPressKit/RemoteReaderSite.swift
index 5b3f35dc..6de803c9 100644
--- a/WordPressKit/RemoteReaderSite.swift
+++ b/WordPressKit/RemoteReaderSite.swift
@@ -2,12 +2,12 @@ import Foundation
 
 @objcMembers public class RemoteReaderSite: NSObject {
 
-    public var recordID: NSNumber?
-    public var siteID: NSNumber?
-    public var feedID: NSNumber?
-    public var name: String?
-    public var path: String? // URL
-    public var icon: String? // Sites only
+    public var recordID: NSNumber!
+    public var siteID: NSNumber!
+    public var feedID: NSNumber!
+    public var name: String!
+    public var path: String! // URL
+    public var icon: String! // Sites only
     public var isSubscribed: Bool = false
 
 }
diff --git a/WordPressKit/RemoteReaderSiteInfo.swift b/WordPressKit/RemoteReaderSiteInfo.swift
index cde80240..6c061d97 100644
--- a/WordPressKit/RemoteReaderSiteInfo.swift
+++ b/WordPressKit/RemoteReaderSiteInfo.swift
@@ -27,23 +27,23 @@ private let DeliveryMethodEmailKey = "email"
 private let DeliveryMethodNotificationKey = "notification"
 
 @objcMembers public class RemoteReaderSiteInfo: NSObject {
-    public var feedID: NSNumber?
-    public var feedURL: String?
+    public var feedID: NSNumber!
+    public var feedURL: String!
     public var isFollowing: Bool = false
     public var isJetpack: Bool = false
     public var isPrivate: Bool = false
     public var isVisible: Bool = false
-    public var organizationID: NSNumber?
-    public var postCount: NSNumber?
-    public var siteBlavatar: String?
-    public var siteDescription: String?
-    public var siteID: NSNumber?
-    public var siteName: String?
-    public var siteURL: String?
-    public var subscriberCount: NSNumber?
-    public var unseenCount: NSNumber?
-    public var postsEndpoint: String?
-    public var endpointPath: String?
+    public var organizationID: NSNumber!
+    public var postCount: NSNumber!
+    public var siteBlavatar: String!
+    public var siteDescription: String!
+    public var siteID: NSNumber!
+    public var siteName: String!
+    public var siteURL: String!
+    public var subscriberCount: NSNumber!
+    public var unseenCount: NSNumber!
+    public var postsEndpoint: String!
+    public var endpointPath: String!
 
     public var postSubscription: RemoteReaderSiteInfoSubscriptionPost?
     public var emailSubscription: RemoteReaderSiteInfoSubscriptionEmail?
diff --git a/WordPressKit/RemoteReaderTopic.swift b/WordPressKit/RemoteReaderTopic.swift
index 71578323..9615b488 100644
--- a/WordPressKit/RemoteReaderTopic.swift
+++ b/WordPressKit/RemoteReaderTopic.swift
@@ -5,13 +5,13 @@ import Foundation
     public var isMenuItem: Bool = false
     public var isRecommended: Bool = false
     public var isSubscribed: Bool = false
-    public var path: String?
-    public var slug: String?
-    public var title: String?
-    public var topicDescription: String?
-    public var topicID: NSNumber?
-    public var type: String?
-    public var owner: String?
-    public var organizationID: NSNumber?
+    public var path: String!
+    public var slug: String!
+    public var title: String!
+    public var topicDescription: String!
+    public var topicID: NSNumber!
+    public var type: String!
+    public var owner: String!
+    public var organizationID: NSNumber!
 
 }