diff --git a/lib/twitter_ebooks/model.rb b/lib/twitter_ebooks/model.rb
index 33af43d..e7b6958 100644
--- a/lib/twitter_ebooks/model.rb
+++ b/lib/twitter_ebooks/model.rb
@@ -15,7 +15,23 @@ module Ebooks
     end
 
     def self.load(path)
-      Marshal.load(File.open(path, 'rb') { |f| f.read })
+      props = Marshal.load(File.open(path, 'rb') { |f| f.read })
+      @tokens = props[:tokens]
+      @sentences = props[:sentences]
+      @mentions = props[:mentions]
+      @keywords = props[:keywords]
+    end
+
+    def save(path)
+      File.open(path, 'wb') do |f|
+        f.write(Marshal.dump({
+          tokens: @tokens,
+          sentences: @sentences,
+          mentions: @mentions,
+          keywords: @keywords
+        }))
+      end
+      self
     end
 
     def initialize
@@ -98,13 +114,6 @@ module Ebooks
       self
     end
 
-    def save(path)
-      File.open(path, 'wb') do |f|
-        f.write(Marshal.dump(self))
-      end
-      self
-    end
-
     def fix(tweet)
       # This seems to require an external api call
       #begin