diff --git a/.swift-version b/.swift-version
new file mode 100644
index 0000000000..bb576dbde1
--- /dev/null
+++ b/.swift-version
@@ -0,0 +1 @@
+2.3
diff --git a/Charts.podspec b/Charts.podspec
index 0080802d33..eaa6989ebe 100644
--- a/Charts.podspec
+++ b/Charts.podspec
@@ -10,7 +10,6 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.11"
   s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
   s.default_subspec = "Core"
-  s.prepare_command = "sed -i '' -e 's/import Charts//g' Source/ChartsRealm/**/*.swift"
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Source/Charts/**/*.swift"
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
index 656963a6f8..5fd039615f 100644
--- a/Charts.xcodeproj/project.pbxproj
+++ b/Charts.xcodeproj/project.pbxproj
@@ -1299,6 +1299,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_SWIFT_FLAGS = "-DNEEDS_CHARTS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1317,6 +1318,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_SWIFT_FLAGS = "-DNEEDS_CHARTS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/Gemfile b/Gemfile
index 698f848aae..4c8d9e91f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "xcpretty"
-gem "cocoapods"
+gem "cocoapods", "1.1.0.rc.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0728bea24b..81fde30dc9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,31 +1,33 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     claide (1.0.0)
-    cocoapods (1.0.1)
-      activesupport (>= 4.0.2)
+    cocoapods (1.1.0.rc.2)
+      activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.0, < 2.0)
-      cocoapods-core (= 1.0.1)
-      cocoapods-deintegrate (>= 1.0.0, < 2.0)
-      cocoapods-downloader (>= 1.0.0, < 2.0)
+      cocoapods-core (= 1.1.0.rc.2)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.1, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.0.0, < 2.0)
-      cocoapods-try (>= 1.0.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.5)
+      fourflusher (~> 1.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.1)
       nap (~> 1.0)
-      xcodeproj (>= 1.1.0, < 2.0)
-    cocoapods-core (1.0.1)
-      activesupport (>= 4.0.2)
+      xcodeproj (>= 1.3.1, < 2.0)
+    cocoapods-core (1.1.0.rc.2)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
@@ -39,16 +41,17 @@ GEM
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored (1.2)
-    concurrent-ruby (1.0.2)
     escape (0.0.4)
-    fourflusher (0.3.2)
+    fourflusher (1.0.1)
     fuzzy_match (2.0.4)
+    gh_inspector (1.0.2)
     i18n (0.7.0)
+    json (1.8.3)
     minitest (5.9.0)
-    molinillo (0.4.5)
+    molinillo (0.5.1)
     nap (1.1.0)
     netrc (0.7.8)
-    rake (11.2.2)
+    rake (11.3.0)
     rouge (1.11.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -64,9 +67,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.1.0.rc.2)
   rake
   xcpretty
 
 BUNDLED WITH
-   1.12.5
+   1.13.1
diff --git a/Source/ChartsRealm/Data/RealmBarData.swift b/Source/ChartsRealm/Data/RealmBarData.swift
index 60e0f97716..a26fe6f13b 100644
--- a/Source/ChartsRealm/Data/RealmBarData.swift
+++ b/Source/ChartsRealm/Data/RealmBarData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmBarData: BarChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmBarDataSet.swift b/Source/ChartsRealm/Data/RealmBarDataSet.swift
index e5134db759..e2005cd4ed 100644
--- a/Source/ChartsRealm/Data/RealmBarDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmBarDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
diff --git a/Source/ChartsRealm/Data/RealmBarLineScatterCandleBubbleDataSet.swift b/Source/ChartsRealm/Data/RealmBarLineScatterCandleBubbleDataSet.swift
index 105401c63e..6c6280efcc 100644
--- a/Source/ChartsRealm/Data/RealmBarLineScatterCandleBubbleDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmBarLineScatterCandleBubbleDataSet.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -40,4 +41,4 @@ public class RealmBarLineScatterCandleBubbleDataSet: RealmBaseDataSet, IBarLineS
         copy.highlightLineDashLengths = highlightLineDashLengths
         return copy
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmBaseDataSet.swift b/Source/ChartsRealm/Data/RealmBaseDataSet.swift
index 3eb35b4838..b9e571d190 100644
--- a/Source/ChartsRealm/Data/RealmBaseDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmBaseDataSet.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
diff --git a/Source/ChartsRealm/Data/RealmBubbleData.swift b/Source/ChartsRealm/Data/RealmBubbleData.swift
index 703f5f656f..9eef88b9eb 100644
--- a/Source/ChartsRealm/Data/RealmBubbleData.swift
+++ b/Source/ChartsRealm/Data/RealmBubbleData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmBubbleData: BubbleChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmBubbleDataSet.swift b/Source/ChartsRealm/Data/RealmBubbleDataSet.swift
index a1d327ce14..518a03acf6 100644
--- a/Source/ChartsRealm/Data/RealmBubbleDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmBubbleDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
diff --git a/Source/ChartsRealm/Data/RealmCandleData.swift b/Source/ChartsRealm/Data/RealmCandleData.swift
index 4a3190a5b5..339bbcbf94 100644
--- a/Source/ChartsRealm/Data/RealmCandleData.swift
+++ b/Source/ChartsRealm/Data/RealmCandleData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmCandleData: CandleChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmCandleDataSet.swift b/Source/ChartsRealm/Data/RealmCandleDataSet.swift
index 85133c6e0a..0f3fd3a624 100644
--- a/Source/ChartsRealm/Data/RealmCandleDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmCandleDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
diff --git a/Source/ChartsRealm/Data/RealmLineData.swift b/Source/ChartsRealm/Data/RealmLineData.swift
index 4e36ee096e..96520bfcff 100644
--- a/Source/ChartsRealm/Data/RealmLineData.swift
+++ b/Source/ChartsRealm/Data/RealmLineData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmLineData: LineChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmLineDataSet.swift b/Source/ChartsRealm/Data/RealmLineDataSet.swift
index 31c4cb45b1..a47b60a5f6 100644
--- a/Source/ChartsRealm/Data/RealmLineDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmLineDataSet.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -194,4 +195,4 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet
         return copy
     }
     
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmLineRadarDataSet.swift b/Source/ChartsRealm/Data/RealmLineRadarDataSet.swift
index c047975879..7cad073aeb 100644
--- a/Source/ChartsRealm/Data/RealmLineRadarDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmLineRadarDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -93,4 +94,4 @@ public class RealmLineRadarDataSet: RealmLineScatterCandleRadarDataSet, ILineRad
         return copy
     }
     
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmLineScatterCandleRadarDataSet.swift b/Source/ChartsRealm/Data/RealmLineScatterCandleRadarDataSet.swift
index 6b3db4f61a..4f147f6d3b 100644
--- a/Source/ChartsRealm/Data/RealmLineScatterCandleRadarDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmLineScatterCandleRadarDataSet.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -54,4 +55,4 @@ public class RealmLineScatterCandleRadarDataSet: RealmBarLineScatterCandleBubble
         return copy
     }
 
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmPieData.swift b/Source/ChartsRealm/Data/RealmPieData.swift
index 2cfb40dbd0..d3c6395507 100644
--- a/Source/ChartsRealm/Data/RealmPieData.swift
+++ b/Source/ChartsRealm/Data/RealmPieData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmPieData: PieChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmPieDataSet.swift b/Source/ChartsRealm/Data/RealmPieDataSet.swift
index 5a359c21fe..794aa7b44f 100644
--- a/Source/ChartsRealm/Data/RealmPieDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmPieDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -88,4 +89,4 @@ public class RealmPieDataSet: RealmBaseDataSet, IPieChartDataSet
         copy.selectionShift = selectionShift
         return copy
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmRadarData.swift b/Source/ChartsRealm/Data/RealmRadarData.swift
index 7a0a352fbd..90cdc96258 100644
--- a/Source/ChartsRealm/Data/RealmRadarData.swift
+++ b/Source/ChartsRealm/Data/RealmRadarData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
+#if NEEDS_CHARTS
 import Charts
-
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmRadarData: RadarChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmRadarDataSet.swift b/Source/ChartsRealm/Data/RealmRadarDataSet.swift
index 8c4f51a934..224ffe7faf 100644
--- a/Source/ChartsRealm/Data/RealmRadarDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmRadarDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -50,4 +51,4 @@ public class RealmRadarDataSet: RealmLineRadarDataSet, IRadarChartDataSet
     public var highlightCircleOuterRadius: CGFloat = 4.0
     
     public var highlightCircleStrokeWidth: CGFloat = 2.0
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmScatterData.swift b/Source/ChartsRealm/Data/RealmScatterData.swift
index 6a0f5b5d82..370fc3b782 100644
--- a/Source/ChartsRealm/Data/RealmScatterData.swift
+++ b/Source/ChartsRealm/Data/RealmScatterData.swift
@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmScatterData: ScatterChartData
             super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/ChartsRealm/Data/RealmScatterDataSet.swift b/Source/ChartsRealm/Data/RealmScatterDataSet.swift
index ff1b8b57b6..448811401c 100644
--- a/Source/ChartsRealm/Data/RealmScatterDataSet.swift
+++ b/Source/ChartsRealm/Data/RealmScatterDataSet.swift
@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -56,4 +57,4 @@ public class RealmScatterDataSet: RealmLineScatterCandleRadarDataSet, IScatterCh
         return copy
     }
     
-}
\ No newline at end of file
+}