From aab8d12331d01372cfcb4ab157d9b346f3412619 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Wed, 2 Dec 2020 21:50:27 +0900
Subject: [PATCH 1/5] Update gitignore for Swift Package Manager

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 93c86d3b..f5830978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,7 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 # Pods/
+
+# Swift Package Manager
+.build/
+

From 0abcb7a061f8f172a27f5cc9f5d8b54afabb4944 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Wed, 2 Dec 2020 21:55:11 +0900
Subject: [PATCH 2/5] Add missing imports

---
 MessengerKit/Models/MSGUser.swift            | 2 +-
 MessengerKit/Styles/MSGIMessageStyle.swift   | 2 ++
 MessengerKit/Styles/MSGTravamigosStyle.swift | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/MessengerKit/Models/MSGUser.swift b/MessengerKit/Models/MSGUser.swift
index dece3d75..7a9c1aac 100644
--- a/MessengerKit/Models/MSGUser.swift
+++ b/MessengerKit/Models/MSGUser.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Cocoon Development Ltd. All rights reserved.
 //
 
-import Foundation
+import UIKit
 
 /// Objects representing a user within MessengerKit
 /// Must conform to this protocol.
diff --git a/MessengerKit/Styles/MSGIMessageStyle.swift b/MessengerKit/Styles/MSGIMessageStyle.swift
index de3bd916..b24e2714 100644
--- a/MessengerKit/Styles/MSGIMessageStyle.swift
+++ b/MessengerKit/Styles/MSGIMessageStyle.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2018 Cocoon Development Ltd. All rights reserved.
 //
 
+import UIKit
+
 /// Styles the `MSGMessengerViewController` to be similar in style to iMessage.
 public struct MSGIMessageStyle: MSGMessengerStyle {
     
diff --git a/MessengerKit/Styles/MSGTravamigosStyle.swift b/MessengerKit/Styles/MSGTravamigosStyle.swift
index 9aa11e5a..ea58cba8 100644
--- a/MessengerKit/Styles/MSGTravamigosStyle.swift
+++ b/MessengerKit/Styles/MSGTravamigosStyle.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2018 Cocoon Development Ltd. All rights reserved.
 //
 
+import UIKit
+
 /// Styles the messenger view to be similar to that used in Travamigos.
 public struct MSGTravamigosStyle: MSGMessengerStyle {
     

From d260568750f65100e4af1e25249acd915bbbd92e Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Wed, 2 Dec 2020 21:55:42 +0900
Subject: [PATCH 3/5] Add the package manifest

---
 Package.swift | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Package.swift

diff --git a/Package.swift b/Package.swift
new file mode 100644
index 00000000..34afaca4
--- /dev/null
+++ b/Package.swift
@@ -0,0 +1,24 @@
+// swift-tools-version:5.3
+
+import PackageDescription
+
+let package = Package(
+    name: "MessengerKit",
+    platforms: [
+        .iOS(.v10),
+    ],
+    products: [
+        .library(
+            name: "MessengerKit",
+            targets: ["MessengerKit"]
+        ),
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "MessengerKit",
+            dependencies: [],
+            path: "MessengerKit"
+        ),
+    ]
+)

From fbe20dd45cf3c5a27342748a30ff70580d0e29f1 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Wed, 2 Dec 2020 22:10:39 +0900
Subject: [PATCH 4/5] Load resources in the module

---
 MessengerKit/MessengerKit.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MessengerKit/MessengerKit.swift b/MessengerKit/MessengerKit.swift
index ed975172..47cf490f 100644
--- a/MessengerKit/MessengerKit.swift
+++ b/MessengerKit/MessengerKit.swift
@@ -11,6 +11,9 @@ import Foundation
 public final class MessengerKit {
     
     /// The bundle that contains nibs and assets.
+    #if SWIFT_PACKAGE
+    internal static var bundle: Bundle? = .module
+    #else
     internal static var bundle: Bundle? {
         let sourceBundle = Bundle(for: MessengerKit.self)
         
@@ -20,6 +23,7 @@ public final class MessengerKit {
         
         return sourceBundle
     }
+    #endif
     
     private init() { }
     

From d37db5becbddffbbb327267c499244502ac04930 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Wed, 2 Dec 2020 23:41:45 +0900
Subject: [PATCH 5/5] Add an objc name to custom views

---
 MessengerKit/Bubbles/Travamigos/MSGTravIncomingBubble.swift | 1 +
 MessengerKit/Bubbles/Travamigos/MSGTravOutgoingBubble.swift | 1 +
 MessengerKit/Bubbles/iMessage/MSGTailIncomingBubble.swift   | 1 +
 MessengerKit/Bubbles/iMessage/MSGTailOutgoingBubble.swift   | 1 +
 .../Cells/Emoji/MSGEmojiCollectionViewCell.swift            | 1 +
 .../Cells/Emoji/MSGIncomingEmojiCollectionViewCell.xib      | 2 +-
 .../Cells/Emoji/MSGOutgoingEmojiCollectionViewCell.xib      | 2 +-
 .../Cells/Media/MSGImageCollectionViewCell.swift            | 1 +
 .../Cells/Media/MSGIncomingImageCollectionViewCell.xib      | 2 +-
 .../Cells/Media/MSGOutgoingImageCollectionViewCell.xib      | 2 +-
 .../Text/Travamigos/MSGIncomingTravCollectionViewCell.xib   | 4 ++--
 .../Text/Travamigos/MSGOutgoingTravCollectionViewCell.xib   | 4 ++--
 .../Cells/Text/Travamigos/MSGTravCollectionViewCell.swift   | 1 +
 .../Text/iMessage/MSGIncomingTailCollectionViewCell.xib     | 4 ++--
 .../Text/iMessage/MSGOutgoingTailCollectionViewCell.xib     | 4 ++--
 .../Cells/Text/iMessage/MSGTailCollectionViewCell.swift     | 1 +
 .../Travamigos/MSGTravCollectionViewSectionFooter.swift     | 1 +
 .../Travamigos/MSGTravCollectionViewSectionHeader.swift     | 1 +
 .../MSGTravIncomingCollectionViewSectionFooter.xib          | 2 +-
 .../MSGTravIncomingCollectionViewSectionHeader.xib          | 2 +-
 .../MSGTravOutgoingCollectionViewSectionFooter.xib          | 2 +-
 .../MSGTravOutgoingCollectionViewSectionHeader.xib          | 2 +-
 .../Header Footers/iMessage/MSGImessageFooterView.swift     | 1 +
 .../Header Footers/iMessage/MSGImessageHeaderView.swift     | 1 +
 .../iMessage/MSGImessageIncomingFooterView.xib              | 2 +-
 .../iMessage/MSGImessageIncomingHeaderView.xib              | 2 +-
 .../iMessage/MSGImessageOutgoingFooterView.xib              | 2 +-
 .../iMessage/MSGImessageOutgoingHeaderView.xib              | 2 +-
 MessengerKit/Input/MSGPlaceholderTextView.swift             | 1 +
 .../Input/Styles/iMessage/MSGImessageInputView.swift        | 1 +
 MessengerKit/Input/Styles/iMessage/MSGImessageInputView.xib | 6 +++---
 .../Input/Styles/iMessage/MSGImessageSendButton.swift       | 1 +
 MessengerKit/Messenger View/MSGMessengerView.swift          | 1 +
 MessengerKit/Messenger View/MSGMessengerView.xib            | 2 +-
 34 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/MessengerKit/Bubbles/Travamigos/MSGTravIncomingBubble.swift b/MessengerKit/Bubbles/Travamigos/MSGTravIncomingBubble.swift
index 6879c4b2..c8efe947 100644
--- a/MessengerKit/Bubbles/Travamigos/MSGTravIncomingBubble.swift
+++ b/MessengerKit/Bubbles/Travamigos/MSGTravIncomingBubble.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGTravIncomingBubble)
 class MSGTravIncomingBubble: MSGTravOutgoingBubble {
     
     override var gradientColors: [CGColor] {
diff --git a/MessengerKit/Bubbles/Travamigos/MSGTravOutgoingBubble.swift b/MessengerKit/Bubbles/Travamigos/MSGTravOutgoingBubble.swift
index c1bceed6..246a578e 100644
--- a/MessengerKit/Bubbles/Travamigos/MSGTravOutgoingBubble.swift
+++ b/MessengerKit/Bubbles/Travamigos/MSGTravOutgoingBubble.swift
@@ -9,6 +9,7 @@
 import UIKit
 
 /// A bubble for outgoing messages for use in the Travamigos style.
+@objc(MSGTravOutgoingBubble)
 class MSGTravOutgoingBubble: UITextView {
     
     var gradientLayer = CAGradientLayer()
diff --git a/MessengerKit/Bubbles/iMessage/MSGTailIncomingBubble.swift b/MessengerKit/Bubbles/iMessage/MSGTailIncomingBubble.swift
index a41d1f2b..7eb45997 100644
--- a/MessengerKit/Bubbles/iMessage/MSGTailIncomingBubble.swift
+++ b/MessengerKit/Bubbles/iMessage/MSGTailIncomingBubble.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGTailIncomingBubble)
 public class MSGTailIncomingBubble: MSGTailOutgoingBubble {
     
     
diff --git a/MessengerKit/Bubbles/iMessage/MSGTailOutgoingBubble.swift b/MessengerKit/Bubbles/iMessage/MSGTailOutgoingBubble.swift
index 8dae762a..72352260 100644
--- a/MessengerKit/Bubbles/iMessage/MSGTailOutgoingBubble.swift
+++ b/MessengerKit/Bubbles/iMessage/MSGTailOutgoingBubble.swift
@@ -9,6 +9,7 @@
 import UIKit
 
 /// A bubble for outgoing messages for use in the iMessage style.
+@objc(MSGTailOutgoingBubble)
 public class MSGTailOutgoingBubble: UITextView {
     
     lazy var tailImage: UIImage = {
diff --git a/MessengerKit/Collection View/Cells/Emoji/MSGEmojiCollectionViewCell.swift b/MessengerKit/Collection View/Cells/Emoji/MSGEmojiCollectionViewCell.swift
index d258537b..3c981734 100644
--- a/MessengerKit/Collection View/Cells/Emoji/MSGEmojiCollectionViewCell.swift	
+++ b/MessengerKit/Collection View/Cells/Emoji/MSGEmojiCollectionViewCell.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGEmojiCollectionViewCell)
 class MSGEmojiCollectionViewCell: MSGMessageCell {
     
     @IBOutlet weak var textLabel: UILabel!
diff --git a/MessengerKit/Collection View/Cells/Emoji/MSGIncomingEmojiCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Emoji/MSGIncomingEmojiCollectionViewCell.xib
index 3835f036..be193d59 100644
--- a/MessengerKit/Collection View/Cells/Emoji/MSGIncomingEmojiCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Emoji/MSGIncomingEmojiCollectionViewCell.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingEmoji" id="iHK-tj-MIl" customClass="MSGEmojiCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingEmoji" id="iHK-tj-MIl" customClass="MSGEmojiCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="262" height="67"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
diff --git a/MessengerKit/Collection View/Cells/Emoji/MSGOutgoingEmojiCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Emoji/MSGOutgoingEmojiCollectionViewCell.xib
index d695ffd5..f646eee9 100644
--- a/MessengerKit/Collection View/Cells/Emoji/MSGOutgoingEmojiCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Emoji/MSGOutgoingEmojiCollectionViewCell.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingEmoji" id="gTV-IL-0wX" customClass="MSGEmojiCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingEmoji" id="gTV-IL-0wX" customClass="MSGEmojiCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="262" height="67"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
diff --git a/MessengerKit/Collection View/Cells/Media/MSGImageCollectionViewCell.swift b/MessengerKit/Collection View/Cells/Media/MSGImageCollectionViewCell.swift
index 680f22a0..8b51203c 100644
--- a/MessengerKit/Collection View/Cells/Media/MSGImageCollectionViewCell.swift	
+++ b/MessengerKit/Collection View/Cells/Media/MSGImageCollectionViewCell.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGImageCollectionViewCell)
 class MSGImageCollectionViewCell: MSGMessageCell {
     
     @IBOutlet weak var imageView: UIImageView!
diff --git a/MessengerKit/Collection View/Cells/Media/MSGIncomingImageCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Media/MSGIncomingImageCollectionViewCell.xib
index d41a40ad..7167f8a1 100644
--- a/MessengerKit/Collection View/Cells/Media/MSGIncomingImageCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Media/MSGIncomingImageCollectionViewCell.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingImage" id="rWJ-Ue-VCr" customClass="MSGImageCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingImage" id="rWJ-Ue-VCr" customClass="MSGImageCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="269" height="176"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
diff --git a/MessengerKit/Collection View/Cells/Media/MSGOutgoingImageCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Media/MSGOutgoingImageCollectionViewCell.xib
index dc356e20..3e453103 100644
--- a/MessengerKit/Collection View/Cells/Media/MSGOutgoingImageCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Media/MSGOutgoingImageCollectionViewCell.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingImage" id="nw2-Kp-ZmF" customClass="MSGImageCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingImage" id="nw2-Kp-ZmF" customClass="MSGImageCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="269" height="176"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
diff --git a/MessengerKit/Collection View/Cells/Text/Travamigos/MSGIncomingTravCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Text/Travamigos/MSGIncomingTravCollectionViewCell.xib
index f0b34737..06476c17 100644
--- a/MessengerKit/Collection View/Cells/Text/Travamigos/MSGIncomingTravCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Text/Travamigos/MSGIncomingTravCollectionViewCell.xib	
@@ -12,14 +12,14 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingText" id="tW5-Ws-Ark" customClass="MSGTravCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingText" id="tW5-Ws-Ark" customClass="MSGTravCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="413" height="87"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="413" height="87"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Y3t-4j-CM1" customClass="MSGTravIncomingBubble" customModule="MessengerKit" customModuleProvider="target">
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Y3t-4j-CM1" customClass="MSGTravIncomingBubble">
                         <rect key="frame" x="20" y="0.0" width="413" height="87"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
diff --git a/MessengerKit/Collection View/Cells/Text/Travamigos/MSGOutgoingTravCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Text/Travamigos/MSGOutgoingTravCollectionViewCell.xib
index 5ddbe1cd..90a3f3f1 100644
--- a/MessengerKit/Collection View/Cells/Text/Travamigos/MSGOutgoingTravCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Text/Travamigos/MSGOutgoingTravCollectionViewCell.xib	
@@ -12,14 +12,14 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingText" id="rMi-IG-xwc" customClass="MSGTravCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingText" id="rMi-IG-xwc" customClass="MSGTravCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="413" height="87"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="413" height="87"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="iP3-kn-N1L" customClass="MSGTravOutgoingBubble" customModule="MessengerKit" customModuleProvider="target">
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="iP3-kn-N1L" customClass="MSGTravOutgoingBubble">
                         <rect key="frame" x="-20" y="0.0" width="413" height="87"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
diff --git a/MessengerKit/Collection View/Cells/Text/Travamigos/MSGTravCollectionViewCell.swift b/MessengerKit/Collection View/Cells/Text/Travamigos/MSGTravCollectionViewCell.swift
index 6800902a..5380ffe7 100644
--- a/MessengerKit/Collection View/Cells/Text/Travamigos/MSGTravCollectionViewCell.swift	
+++ b/MessengerKit/Collection View/Cells/Text/Travamigos/MSGTravCollectionViewCell.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGTravCollectionViewCell)
 open class MSGTravCollectionViewCell: MSGMessageCell {
     
     @IBOutlet weak var bubbleWidthConstraint: NSLayoutConstraint!
diff --git a/MessengerKit/Collection View/Cells/Text/iMessage/MSGIncomingTailCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Text/iMessage/MSGIncomingTailCollectionViewCell.xib
index 9d0588a7..5568b57d 100644
--- a/MessengerKit/Collection View/Cells/Text/iMessage/MSGIncomingTailCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Text/iMessage/MSGIncomingTailCollectionViewCell.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingText" id="8x7-fQ-N8C" customClass="MSGTailCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingText" id="8x7-fQ-N8C" customClass="MSGTailCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="254" height="50"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -22,7 +22,7 @@
                     <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Incoming Tail Bubble" translatesAutoresizingMaskIntoConstraints="NO" id="X8a-x4-5LZ">
                         <rect key="frame" x="0.0" y="0.0" width="254" height="50"/>
                     </imageView>
-                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Sfz-Zd-GRq" customClass="MSGTailIncomingBubble" customModule="MessengerKit" customModuleProvider="target">
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Sfz-Zd-GRq" customClass="MSGTailIncomingBubble">
                         <rect key="frame" x="10" y="0.0" width="254" height="50"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
diff --git a/MessengerKit/Collection View/Cells/Text/iMessage/MSGOutgoingTailCollectionViewCell.xib b/MessengerKit/Collection View/Cells/Text/iMessage/MSGOutgoingTailCollectionViewCell.xib
index ba7de826..955b7629 100644
--- a/MessengerKit/Collection View/Cells/Text/iMessage/MSGOutgoingTailCollectionViewCell.xib	
+++ b/MessengerKit/Collection View/Cells/Text/iMessage/MSGOutgoingTailCollectionViewCell.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingText" id="gTV-IL-0wX" customClass="MSGTailCollectionViewCell" customModule="MessengerKit" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingText" id="gTV-IL-0wX" customClass="MSGTailCollectionViewCell">
             <rect key="frame" x="0.0" y="0.0" width="254" height="50"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -22,7 +22,7 @@
                     <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Incoming Tail Bubble" translatesAutoresizingMaskIntoConstraints="NO" id="xQK-C3-D0o">
                         <rect key="frame" x="0.0" y="0.0" width="254" height="50"/>
                     </imageView>
-                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="wnT-yo-zFk" customClass="MSGTailOutgoingBubble" customModule="MessengerKit" customModuleProvider="target">
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="wnT-yo-zFk" customClass="MSGTailOutgoingBubble">
                         <rect key="frame" x="-10" y="0.0" width="254" height="50"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
diff --git a/MessengerKit/Collection View/Cells/Text/iMessage/MSGTailCollectionViewCell.swift b/MessengerKit/Collection View/Cells/Text/iMessage/MSGTailCollectionViewCell.swift
index f005f820..ad6cc79a 100644
--- a/MessengerKit/Collection View/Cells/Text/iMessage/MSGTailCollectionViewCell.swift	
+++ b/MessengerKit/Collection View/Cells/Text/iMessage/MSGTailCollectionViewCell.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGTailCollectionViewCell)
 open class MSGTailCollectionViewCell: MSGMessageCell {
     
     @IBOutlet public weak var bubble: MSGTailOutgoingBubble!
diff --git a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionFooter.swift b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionFooter.swift
index 35a1f939..9b9b1a7c 100644
--- a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionFooter.swift	
+++ b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionFooter.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGTravCollectionViewSectionFooter)
 class MSGTravCollectionViewSectionFooter: MSGSectionReusableView {
     
     @IBOutlet weak var avatarImageView: UIImageView!
diff --git a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionHeader.swift b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionHeader.swift
index ee1b8960..8abd236c 100644
--- a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionHeader.swift	
+++ b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravCollectionViewSectionHeader.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGTravCollectionViewSectionHeader)
 class MSGTravCollectionViewSectionHeader: MSGSectionReusableView {
     
     @IBOutlet weak var label: UILabel!
diff --git a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionFooter.xib b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionFooter.xib
index 33a1357c..fb73db72 100644
--- a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionFooter.xib	
+++ b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionFooter.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="aYn-FC-oRd" customClass="MSGTravCollectionViewSectionFooter" customModule="MessengerKit" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="aYn-FC-oRd" customClass="MSGTravCollectionViewSectionFooter">
             <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionHeader.xib b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionHeader.xib
index 3477a0eb..de56330d 100644
--- a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionHeader.xib	
+++ b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravIncomingCollectionViewSectionHeader.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="uhH-Sw-vSz" customClass="MSGTravCollectionViewSectionHeader" customModule="MessengerKit" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="uhH-Sw-vSz" customClass="MSGTravCollectionViewSectionHeader">
             <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionFooter.xib b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionFooter.xib
index 3527854e..eb632b31 100644
--- a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionFooter.xib	
+++ b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionFooter.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="hvT-uQ-kFp" customClass="MSGTravCollectionViewSectionFooter" customModule="MessengerKit" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="hvT-uQ-kFp" customClass="MSGTravCollectionViewSectionFooter">
             <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionHeader.xib b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionHeader.xib
index 80485b24..4da95805 100644
--- a/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionHeader.xib	
+++ b/MessengerKit/Collection View/Header Footers/Travamigos/MSGTravOutgoingCollectionViewSectionHeader.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="dXB-AG-cb4" customClass="MSGTravCollectionViewSectionHeader" customModule="MessengerKit" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="dXB-AG-cb4" customClass="MSGTravCollectionViewSectionHeader">
             <rect key="frame" x="0.0" y="0.0" width="375" height="30"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageFooterView.swift b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageFooterView.swift
index 59ab6479..cc0b4b5e 100644
--- a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageFooterView.swift	
+++ b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageFooterView.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGImessageFooterView)
 class MSGImessageFooterView: MSGSectionReusableView {
     
     @IBOutlet weak var label: UILabel!
diff --git a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageHeaderView.swift b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageHeaderView.swift
index a6b2cd0c..70367e18 100644
--- a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageHeaderView.swift	
+++ b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageHeaderView.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGImessageHeaderView)
 class MSGImessageHeaderView: MSGSectionReusableView {
     
     @IBOutlet weak var label: UILabel!
diff --git a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingFooterView.xib b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingFooterView.xib
index c177b64c..6f84f33d 100644
--- a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingFooterView.xib	
+++ b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingFooterView.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingFooter" id="s0D-P6-Fmu" customClass="MSGImessageFooterView" customModule="MessengerKit" customModuleProvider="target">
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingFooter" id="s0D-P6-Fmu" customClass="MSGImessageFooterView">
             <rect key="frame" x="0.0" y="0.0" width="425" height="49"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingHeaderView.xib b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingHeaderView.xib
index 0b5d6d86..26b9396d 100644
--- a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingHeaderView.xib	
+++ b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageIncomingHeaderView.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingHeader" id="tyy-rb-xZG" customClass="MSGImessageHeaderView" customModule="MessengerKit" customModuleProvider="target">
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="incomingHeader" id="tyy-rb-xZG" customClass="MSGImessageHeaderView">
             <rect key="frame" x="0.0" y="0.0" width="425" height="49"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingFooterView.xib b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingFooterView.xib
index 60dd1d34..254639f4 100644
--- a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingFooterView.xib	
+++ b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingFooterView.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingFooter" id="BdN-kJ-dti" customClass="MSGImessageFooterView" customModule="MessengerKit" customModuleProvider="target">
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingFooter" id="BdN-kJ-dti" customClass="MSGImessageFooterView">
             <rect key="frame" x="0.0" y="0.0" width="425" height="49"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
diff --git a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingHeaderView.xib b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingHeaderView.xib
index a43d1168..69ef7445 100644
--- a/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingHeaderView.xib	
+++ b/MessengerKit/Collection View/Header Footers/iMessage/MSGImessageOutgoingHeaderView.xib	
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingHeader" id="U6b-Vx-4bR" customClass="MSGImessageHeaderView" customModule="MessengerKit" customModuleProvider="target">
+        <collectionReusableView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="outgoingHeader" id="U6b-Vx-4bR" customClass="MSGImessageHeaderView">
             <rect key="frame" x="0.0" y="0.0" width="425" height="49"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
diff --git a/MessengerKit/Input/MSGPlaceholderTextView.swift b/MessengerKit/Input/MSGPlaceholderTextView.swift
index 7dd55051..7d7e41ec 100644
--- a/MessengerKit/Input/MSGPlaceholderTextView.swift
+++ b/MessengerKit/Input/MSGPlaceholderTextView.swift
@@ -11,6 +11,7 @@ import UIKit
 /// A text view that supports a placeholder.
 ///
 /// (I really should open a radar to request a native control).
+@objc(MSGPlaceholderTextView)
 open class MSGPlaceholderTextView: UIView {
     
     /// The actual text view being used
diff --git a/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.swift b/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.swift
index 548692b7..7aa4d55d 100644
--- a/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.swift
+++ b/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGImessageInputView)
 open class MSGImessageInputView: MSGInputView {
     
     override open class var nib: UINib? {
diff --git a/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.xib b/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.xib
index 46c03f8d..123624d4 100644
--- a/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.xib
+++ b/MessengerKit/Input/Styles/iMessage/MSGImessageInputView.xib
@@ -12,15 +12,15 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MSGImessageInputView" customModule="MessengerKit" customModuleProvider="target"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MSGImessageInputView" customModule="MessengerKit" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MSGImessageInputView">
             <rect key="frame" x="0.0" y="0.0" width="434" height="50"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eQZ-xx-JWZ" customClass="MSGPlaceholderTextView" customModule="MessengerKit" customModuleProvider="target">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eQZ-xx-JWZ" customClass="MSGPlaceholderTextView">
                     <rect key="frame" x="10" y="5" width="414" height="40"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="grt-NM-bT7" customClass="MSGImessageSendButton" customModule="MessengerKit" customModuleProvider="target">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="grt-NM-bT7" customClass="MSGImessageSendButton">
                     <rect key="frame" x="389" y="11" width="30" height="30"/>
                     <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
diff --git a/MessengerKit/Input/Styles/iMessage/MSGImessageSendButton.swift b/MessengerKit/Input/Styles/iMessage/MSGImessageSendButton.swift
index d2d2dea5..83ccf334 100644
--- a/MessengerKit/Input/Styles/iMessage/MSGImessageSendButton.swift
+++ b/MessengerKit/Input/Styles/iMessage/MSGImessageSendButton.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 
+@objc(MSGImessageSendButton)
 class MSGImessageSendButton: UIButton {
 
     let overlay = CALayer()
diff --git a/MessengerKit/Messenger View/MSGMessengerView.swift b/MessengerKit/Messenger View/MSGMessengerView.swift
index 9046c1f0..90354676 100644
--- a/MessengerKit/Messenger View/MSGMessengerView.swift	
+++ b/MessengerKit/Messenger View/MSGMessengerView.swift	
@@ -10,6 +10,7 @@ import UIKit
 
 /// Internal class used to load the collection view and input view for `MSGMessengerView`.
 /// This view simply contains two containers and is loaded from the `MSGMessengerView` nib.
+@objc(MSGMessengerView)
 class MSGMessengerView: UIView {
     
     @IBOutlet weak var backgroundView: UIView!
diff --git a/MessengerKit/Messenger View/MSGMessengerView.xib b/MessengerKit/Messenger View/MSGMessengerView.xib
index c063cd23..6be0d90a 100644
--- a/MessengerKit/Messenger View/MSGMessengerView.xib	
+++ b/MessengerKit/Messenger View/MSGMessengerView.xib	
@@ -16,7 +16,7 @@
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="8ZW-h7-1jb" customClass="MSGMessengerView" customModule="MessengerKit" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="8ZW-h7-1jb" customClass="MSGMessengerView">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>