diff --git a/.gitignore b/.gitignore
index b957ede..5df313e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 # Pods/
+/Example/RxFirebase.xcworkspace/xcshareddata
diff --git a/README.md b/README.md
index ee62aeb..d4e4de1 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ RxFirebase is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
 ```ruby
-pod 'RxFirebase'
+pod 'RxFirebase/Firestore'
 ```
 
 ## Usage
diff --git a/RxFirebase.podspec b/RxFirebase.podspec
index 43d0eb6..eba9df3 100644
--- a/RxFirebase.podspec
+++ b/RxFirebase.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
   s.name             = 'RxFirebase'
   s.version          = '0.1.0'
-  s.summary          = 'A short description of RxFirebase.'
+  s.summary          = 'RxSwift extensions for Firebase.'
 
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
@@ -18,7 +18,8 @@ Pod::Spec.new do |s|
 #   * Finally, don't worry about the indent, CocoaPods strips it!
 
   s.description      = <<-DESC
-TODO: Add long description of the pod here.
+RxSwift extensions for Firebase.
+Including for now FirebaseCore
                        DESC
 
   s.homepage         = 'https://github.com/arnauddorgans/RxFirebase'
@@ -28,20 +29,20 @@ TODO: Add long description of the pod here.
   s.source           = { :git => 'https://github.com/arnauddorgans/RxFirebase.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
+swift_version = 4.1
   s.ios.deployment_target = '8.0'
-    s.default_subspec = 'Core'
     s.static_framework = true
     s.dependency 'RxSwift', '~> 4'
     s.dependency 'RxCocoa', '~> 4'
     s.dependency 'FirebaseCore', '~> 4'
 
-    s.subspec 'Core' do |core|
-        core.source_files = 'RxFirebase/Classes/Core/**/*'
-    end
-    s.subspec 'Database' do |database|
-        database.source_files = 'RxFirebase/Classes/Database/**/*'
-        database.dependency 'FirebaseDatabase', '~> 4'
-    end
+#s.subspec 'Core' do |core|
+#core.source_files = 'RxFirebase/Classes/Core/**/*'
+#end
+#s.subspec 'Database' do |database|
+#database.source_files = 'RxFirebase/Classes/Database/**/*'
+#database.dependency 'FirebaseDatabase', '~> 4'
+#end
     s.subspec 'Firestore' do |firestore|
         firestore.source_files = 'RxFirebase/Classes/Firestore/**/*'
         firestore.dependency 'FirebaseFirestore', '~> 0'
diff --git a/RxFirebase/Classes/Core/ReplaceMe.swift b/RxFirebase/Classes/Core/ReplaceMe.swift
deleted file mode 100644
index e69de29..0000000