diff --git a/lib/redistat.rb b/lib/redistat.rb
index 4d9dd5c..639abae 100644
--- a/lib/redistat.rb
+++ b/lib/redistat.rb
@@ -1,10 +1,9 @@
 
 require "redis"
-require "yaml"
+require "date"
 require "time"
 require "digest/sha1"
 
-require "redistat/extensions/date_time"
 require "redistat/database"
 require "redistat/model"
 require "redistat/event"
diff --git a/lib/redistat/date.rb b/lib/redistat/date.rb
index 4214364..eba7bc5 100644
--- a/lib/redistat/date.rb
+++ b/lib/redistat/date.rb
@@ -55,4 +55,17 @@ module Redistat
     alias :to_string :to_s
     
   end
+end
+
+
+class Date
+  def to_redistat
+    Redistat::Date.new(self)
+  end
+end
+
+class Time
+  def to_redistat
+    Redistat::Date.new(self)
+  end
 end
\ No newline at end of file
diff --git a/lib/redistat/extensions/date_time.rb b/lib/redistat/extensions/date_time.rb
deleted file mode 100644
index a2ec874..0000000
--- a/lib/redistat/extensions/date_time.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Date
-  def to_redistat(depth = nil)
-    Redistat::Date.new(self).to_s(depth)
-  end
-end
-
-class Time
-  def to_redistat(depth = nil)
-    Redistat::Date.new(self).to_s(depth)
-  end
-end
\ No newline at end of file