diff --git a/Podfile.lock b/Podfile.lock
index 1d97309..b6e8bf5 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -112,47 +112,47 @@ PODS:
   - nanopb/decode (0.3.901)
   - nanopb/encode (0.3.901)
   - Protobuf (3.6.1)
-  - RxAtomic (4.4.0)
-  - RxCocoa (4.4.0):
+  - RxAtomic (4.4.1)
+  - RxCocoa (4.4.1):
     - RxSwift (~> 4.0)
-  - RxFirebase/Auth (0.3.2):
+  - RxFirebase/Auth (0.3.3):
     - RxFirebaseAuthentication (~> 0.3)
-  - RxFirebase/Database (0.3.2):
+  - RxFirebase/Database (0.3.3):
     - RxFirebaseDatabase (~> 0.3)
-  - RxFirebase/Firestore (0.3.2):
+  - RxFirebase/Firestore (0.3.3):
     - RxFirebaseFirestore (~> 0.3)
-  - RxFirebase/Functions (0.3.2):
+  - RxFirebase/Functions (0.3.3):
     - RxFirebaseFunctions (~> 0.3)
-  - RxFirebase/RemoteConfig (0.3.2):
+  - RxFirebase/RemoteConfig (0.3.3):
     - RxFirebaseRemoteConfig (~> 0.3)
-  - RxFirebase/Storage (0.3.2):
+  - RxFirebase/Storage (0.3.3):
     - RxFirebaseStorage (~> 0.3)
-  - RxFirebaseAuthentication (0.3.2):
+  - RxFirebaseAuthentication (0.3.3):
     - FirebaseAuth (~> 5)
     - FirebaseCore (~> 5)
     - RxCocoa (~> 4)
     - RxSwift (~> 4)
-  - RxFirebaseDatabase (0.3.2):
+  - RxFirebaseDatabase (0.3.3):
     - FirebaseDatabase (~> 5)
     - RxCocoa (~> 4)
     - RxSwift (~> 4)
-  - RxFirebaseFirestore (0.3.2):
+  - RxFirebaseFirestore (0.3.3):
     - FirebaseFirestore (~> 1)
     - RxCocoa (~> 4)
     - RxSwift (~> 4)
-  - RxFirebaseFunctions (0.3.2):
+  - RxFirebaseFunctions (0.3.3):
     - FirebaseFunctions (~> 2)
     - RxCocoa (~> 4)
     - RxSwift (~> 4)
-  - RxFirebaseRemoteConfig (0.3.2):
+  - RxFirebaseRemoteConfig (0.3.3):
     - FirebaseRemoteConfig (~> 3)
     - RxCocoa (~> 4)
     - RxSwift (~> 4)
-  - RxFirebaseStorage (0.3.2):
+  - RxFirebaseStorage (0.3.3):
     - FirebaseStorage (~> 3)
     - RxCocoa (~> 4)
     - RxSwift (~> 4)
-  - RxSwift (4.4.0):
+  - RxSwift (4.4.1):
     - RxAtomic (~> 4.4)
 
 DEPENDENCIES:
@@ -232,17 +232,17 @@ SPEC CHECKSUMS:
   leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5
-  RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
-  RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
-  RxFirebase: f9add91011e2de3e25edfc207a434b93e36c978e
-  RxFirebaseAuthentication: ade217a1f0bf2120c01e7da8db5b39f927835584
-  RxFirebaseDatabase: 311d91c639501dfcb6bafa5e495fb9d50f0670fc
-  RxFirebaseFirestore: b812e6be5fa479036eb5e267f02898852e1156ea
-  RxFirebaseFunctions: 23574f3e5d2d0c1e12680b1dd563e78446008736
-  RxFirebaseRemoteConfig: 7dd8ada29976a3eb176018cefc682db0a8864d0c
-  RxFirebaseStorage: f3ae2068740c694040fe627f9e79de50ea59cbf8
-  RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
+  RxAtomic: f8d6adc1ccb87a767811269e4875887bc74dbf19
+  RxCocoa: 2f35a76bf8887872e28a1914112395b11b8e0e64
+  RxFirebase: 905b85aac0651d8053a78be90e00fed5b559d7b9
+  RxFirebaseAuthentication: 6a688b0ddd90b72c48694aacc3e2b7e8bd5719bd
+  RxFirebaseDatabase: e6f5c1c4b098f8c1ab80eed3bfb104a3d94ea369
+  RxFirebaseFirestore: 690a9483a072a6270b13d13cb0ff113755ad9ceb
+  RxFirebaseFunctions: 2b9d606a8dad33612ad31533a069e9d3d19762ca
+  RxFirebaseRemoteConfig: f4c1ac13f8db365bab89ad7d6b37e4e2cd6cc1c2
+  RxFirebaseStorage: 35c205f5d5c98ffa63730cffb56feb2fae32f5f2
+  RxSwift: 92fcf68dfef21f3e2ab1965363d9e7b3d787597e
 
-PODFILE CHECKSUM: deb88e7b9181b8ddf82c433edf75dac155d19342
+PODFILE CHECKSUM: 4c17659c65dea6272123034edb4da2060cce69b6
 
 COCOAPODS: 1.6.0
diff --git a/RxFirebase.podspec b/RxFirebase.podspec
index 0b29591..3be29fa 100644
--- a/RxFirebase.podspec
+++ b/RxFirebase.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'RxFirebase'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for Firebase.'
     
     # This description is used to generate tags and improve search results.
@@ -28,23 +28,31 @@ Pod::Spec.new do |s|
     s.author           = { 'Arnaud Dorgans' => 'arnaud.dorgans@gmail.com' }
     s.source           = { :git => 'https://github.com/RxSwiftCommunity/RxFirebase.git', :tag => s.version.to_s }
     # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
-    s.ios.deployment_target = '8.0'    
+    s.ios.deployment_target = '8.0'
+    s.static_framework = true
+
     s.subspec 'Firestore' do |firestore|
         firestore.dependency 'RxFirebaseFirestore', '~> 0.3'
+        firestore.source_files = 'Sources/Core/Firestore.swift'
     end
     s.subspec 'RemoteConfig' do |remote|
         remote.dependency 'RxFirebaseRemoteConfig', '~> 0.3'
+        remote.source_files = 'Sources/Core/RemoteConfig.swift'
     end
     s.subspec 'Database' do |database|
         database.dependency 'RxFirebaseDatabase', '~> 0.3'
+        database.source_files = 'Sources/Core/Database.swift'
     end
     s.subspec 'Storage' do |storage|
         storage.dependency 'RxFirebaseStorage', '~> 0.3'
+        storage.source_files = 'Sources/Core/Storage.swift'
     end
     s.subspec 'Functions' do |functions|
         functions.dependency 'RxFirebaseFunctions', '~> 0.3'
+        functions.source_files = 'Sources/Core/Functions.swift'
     end
     s.subspec 'Auth' do |auth|
         auth.dependency 'RxFirebaseAuthentication', '~> 0.3'
+        auth.source_files = 'Sources/Core/Auth.swift'
     end
 end
diff --git a/RxFirebaseAuthentication.podspec b/RxFirebaseAuthentication.podspec
index 10e79dc..2cd17bf 100644
--- a/RxFirebaseAuthentication.podspec
+++ b/RxFirebaseAuthentication.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseAuthentication'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for FirebaseAuth.'
     
     # This description is used to generate tags and improve search results.
diff --git a/RxFirebaseDatabase.podspec b/RxFirebaseDatabase.podspec
index 21b2610..7911dbf 100644
--- a/RxFirebaseDatabase.podspec
+++ b/RxFirebaseDatabase.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseDatabase'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for FirebaseDatabase.'
     
     # This description is used to generate tags and improve search results.
diff --git a/RxFirebaseFirestore.podspec b/RxFirebaseFirestore.podspec
index 2a35b75..b921428 100644
--- a/RxFirebaseFirestore.podspec
+++ b/RxFirebaseFirestore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseFirestore'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for FirebaseFirestore.'
     
     # This description is used to generate tags and improve search results.
diff --git a/RxFirebaseFunctions.podspec b/RxFirebaseFunctions.podspec
index 53b4e0b..9c2feab 100644
--- a/RxFirebaseFunctions.podspec
+++ b/RxFirebaseFunctions.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseFunctions'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for FirebaseFunctions.'
     
     # This description is used to generate tags and improve search results.
diff --git a/RxFirebaseRemoteConfig.podspec b/RxFirebaseRemoteConfig.podspec
index d6eee44..dc658c3 100644
--- a/RxFirebaseRemoteConfig.podspec
+++ b/RxFirebaseRemoteConfig.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseRemoteConfig'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for FirebaseFirestore.'
     
     # This description is used to generate tags and improve search results.
diff --git a/RxFirebaseStorage.podspec b/RxFirebaseStorage.podspec
index 40d0d0f..c221e59 100644
--- a/RxFirebaseStorage.podspec
+++ b/RxFirebaseStorage.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseStorage'
-    s.version          = '0.3.3'
+    s.version          = '0.3.4'
     s.summary          = 'RxSwift extensions for FirebaseStorage.'
     
     # This description is used to generate tags and improve search results.
diff --git a/Sources/Core/Auth.swift b/Sources/Core/Auth.swift
new file mode 100644
index 0000000..d9c6af4
--- /dev/null
+++ b/Sources/Core/Auth.swift
@@ -0,0 +1 @@
+@_exported import RxFirebaseAuthentication
diff --git a/Sources/Core/Database.swift b/Sources/Core/Database.swift
new file mode 100644
index 0000000..398733b
--- /dev/null
+++ b/Sources/Core/Database.swift
@@ -0,0 +1 @@
+@_exported import RxFirebaseDatabase
diff --git a/Sources/Core/Firestore.swift b/Sources/Core/Firestore.swift
new file mode 100644
index 0000000..ffb5417
--- /dev/null
+++ b/Sources/Core/Firestore.swift
@@ -0,0 +1 @@
+@_exported import RxFirebaseFirestore
diff --git a/Sources/Core/Functions.swift b/Sources/Core/Functions.swift
new file mode 100644
index 0000000..5c47d4b
--- /dev/null
+++ b/Sources/Core/Functions.swift
@@ -0,0 +1 @@
+@_exported import RxFirebaseFunctions
diff --git a/Sources/Core/RemoteConfig.swift b/Sources/Core/RemoteConfig.swift
new file mode 100644
index 0000000..a7a205e
--- /dev/null
+++ b/Sources/Core/RemoteConfig.swift
@@ -0,0 +1 @@
+@_exported import RxFirebaseRemoteConfig
diff --git a/Sources/Core/Storage.swift b/Sources/Core/Storage.swift
new file mode 100644
index 0000000..435de32
--- /dev/null
+++ b/Sources/Core/Storage.swift
@@ -0,0 +1 @@
+@_exported import RxFirebaseStorage