diff --git a/Sources/WalletConnectSign/Auth/Link/LinkEnvelopesDispatcher.swift b/Sources/WalletConnectSign/Auth/Link/LinkEnvelopesDispatcher.swift
index 5eec32a99..2ac026b5a 100644
--- a/Sources/WalletConnectSign/Auth/Link/LinkEnvelopesDispatcher.swift
+++ b/Sources/WalletConnectSign/Auth/Link/LinkEnvelopesDispatcher.swift
@@ -1,5 +1,8 @@
 
+#if os(iOS)
 import UIKit
+#endif
+
 import Combine
 
 final class LinkEnvelopesDispatcher {
diff --git a/WalletConnectSwiftV2.podspec b/WalletConnectSwiftV2.podspec
index e6b1e4cf7..29d8cc4ab 100644
--- a/WalletConnectSwiftV2.podspec
+++ b/WalletConnectSwiftV2.podspec
@@ -2,76 +2,27 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "Sources/WalletConnectRelay/PackageConfig.json")))
 
-#
-#  Be sure to run `pod spec lint WalletConnectSwiftV2.podspec' to ensure this is a
-#  valid spec and to remove all comments including this before submitting the spec.
-#
-#  To learn more about Podspec attributes see https://guides.cocoapods.org/syntax/podspec.html
-#  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
-#
-
 Pod::Spec.new do |spec|
 
-  # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  These will help people to find your library, and whilst it
-  #  can feel like a chore to fill in it's definitely to your advantage. The
-  #  summary should be tweet-length, and the description more in depth.
-  #
-
   spec.name        = "WalletConnectSwiftV2"
   spec.version     = package["version"]
   spec.summary     = "Swift implementation of WalletConnect v.2 protocol for native iOS applications."
   spec.description = "The communications protocol for web3, WalletConnect brings the ecosystem together by enabling wallets and apps to securely connect and interact."
   spec.homepage    = "https://walletconnect.com"
   spec.license     = { :type => 'Apache-2.0', :file => 'LICENSE' }
-
-  # ――― Author Metadata  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  Specify the authors of the library, with email addresses. Email addresses
-  #  of the authors are extracted from the SCM log. E.g. $ git log. CocoaPods also
-  #  accepts just a name if you'd rather not provide an email address.
-  #
-  #  Specify a social_media_url where others can refer to, for example a twitter
-  #  profile URL.
-  #
-
   spec.authors          = "WalletConnect, Inc."
   spec.social_media_url = "https://twitter.com/WalletConnect"
-
-  # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  Specify the location from where the source should be retrieved.
-  #  Supports git, hg, bzr, svn and HTTP.
-  #
-
   spec.source = {
     :git => 'https://github.com/WalletConnect/WalletConnectSwiftV2.git',
     :tag => spec.version.to_s
   }
-
-  # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-  #
-  #  If this Pod runs only on iOS or OS X, then specify the platform and
-  #  the deployment target. You can optionally include the target after the platform.
-  #
-
-  ios_deployment_target  = '13.0'
-  osx_deployment_target  = '10.15'
-  tvos_deployment_target = '13.0'
-
+  
+  spec.platform     = :ios, '13.0'
   spec.swift_versions = '5.3'
-
   spec.pod_target_xcconfig = {
     'OTHER_SWIFT_FLAGS' => '-DCocoaPods'
   }
 
-  spec.ios.deployment_target  = ios_deployment_target
-  spec.osx.deployment_target  = osx_deployment_target
-  spec.tvos.deployment_target = tvos_deployment_target
-
-  # ――― Sub Specs ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-
   spec.default_subspecs = 'WalletConnect'
 
   spec.subspec 'WalletConnect' do |ss|
@@ -87,6 +38,7 @@ Pod::Spec.new do |spec|
     ss.dependency 'WalletConnectSwiftV2/WalletConnectPairing'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectSigner'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectVerify'
+    ss.dependency 'WalletConnectSwiftV2/Events'
   end
 
   spec.subspec 'WalletConnectAuth' do |ss|
@@ -144,6 +96,7 @@ Pod::Spec.new do |spec|
   spec.subspec 'WalletConnectPairing' do |ss|
     ss.source_files = 'Sources/WalletConnectPairing/**/*.{h,m,swift}'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectNetworking'
+    ss.dependency 'WalletConnectSwiftV2/Events'
   end
 
   spec.subspec 'WalletConnectRouter' do |ss|
@@ -175,6 +128,12 @@ Pod::Spec.new do |spec|
     ss.source_files = 'Sources/Commons/**/*.{h,m,swift}'
   end
 
+  spec.subspec 'Events' do |ss|
+    ss.source_files = 'Sources/Events/**/*.{h,m,swift}'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectNetworking'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectUtils'
+  end
+
   spec.subspec 'JSONRPC' do |ss|
     ss.source_files = 'Sources/JSONRPC/**/*.{h,m,swift}'
     ss.dependency 'WalletConnectSwiftV2/Commons'
@@ -189,6 +148,5 @@ Pod::Spec.new do |spec|
     ss.dependency 'WalletConnectSwiftV2/WalletConnectSign'
     ss.dependency 'DSF_QRCode', '~> 16.1.1'
     ss.platform = :ios
-    # TODO: Re-add macOS nad tvOS support once fixed
   end
 end