diff --git a/include/sqlpp11/column_types.h b/include/sqlpp11/column_types.h
index a6db384c..662d4179 100644
--- a/include/sqlpp11/column_types.h
+++ b/include/sqlpp11/column_types.h
@@ -29,6 +29,7 @@
 
 #include <sqlpp11/boolean.h>
 #include <sqlpp11/date.h>
+#include <sqlpp11/date_time.h>
 #include <sqlpp11/integral.h>
 #include <sqlpp11/floating_point.h>
 #include <sqlpp11/text.h>
diff --git a/include/sqlpp11/date.h b/include/sqlpp11/date.h
index 4fcfbefe..2ebf784d 100644
--- a/include/sqlpp11/date.h
+++ b/include/sqlpp11/date.h
@@ -27,7 +27,7 @@
 #ifndef SQLPP_DATE_H
 #define SQLPP_DATE_H
 
-#include <sqlpp11/date_fwd.h>
+#include <sqlpp11/date_time_fwd.h>
 #include <sqlpp11/basic_expression_operators.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/exception.h>
@@ -45,7 +45,7 @@ namespace sqlpp
     using _cpp_value_type = day_point;
 
     template <typename T>
-    using _is_valid_operand = is_date_t<T>;
+    using _is_valid_operand = is_time_point_t<T>;
   };
 
   // date parameter value
@@ -131,42 +131,6 @@ namespace sqlpp
   {
     template <typename T>
     using _is_valid_operand = is_valid_operand<date, T>;
-
-    template <typename T>
-    auto operator+=(T t) const -> assignment_t<Base, plus_t<Base, value_type_t<T>, wrap_operand_t<T>>>
-    {
-      using rhs = wrap_operand_t<T>;
-      static_assert(_is_valid_operand<rhs>::value, "invalid rhs assignment operand");
-
-      return {*static_cast<const Base*>(this), {{*static_cast<const Base*>(this), rhs{t}}}};
-    }
-
-    template <typename T>
-    auto operator-=(T t) const -> assignment_t<Base, minus_t<Base, value_type_t<T>, wrap_operand_t<T>>>
-    {
-      using rhs = wrap_operand_t<T>;
-      static_assert(_is_valid_operand<rhs>::value, "invalid rhs assignment operand");
-
-      return {*static_cast<const Base*>(this), {{*static_cast<const Base*>(this), rhs{t}}}};
-    }
-
-    template <typename T>
-    auto operator/=(T t) const -> assignment_t<Base, divides_t<Base, wrap_operand_t<T>>>
-    {
-      using rhs = wrap_operand_t<T>;
-      static_assert(_is_valid_operand<rhs>::value, "invalid rhs assignment operand");
-
-      return {*static_cast<const Base*>(this), {{*static_cast<const Base*>(this), rhs{t}}}};
-    }
-
-    template <typename T>
-    auto operator*=(T t) const -> assignment_t<Base, multiplies_t<Base, value_type_t<T>, wrap_operand_t<T>>>
-    {
-      using rhs = wrap_operand_t<T>;
-      static_assert(_is_valid_operand<rhs>::value, "invalid rhs assignment operand");
-
-      return {*static_cast<const Base*>(this), {{*static_cast<const Base*>(this), rhs{t}}}};
-    }
   };
 
   // date result field
diff --git a/include/sqlpp11/date_time.h b/include/sqlpp11/date_time.h
new file mode 100644
index 00000000..f8a11831
--- /dev/null
+++ b/include/sqlpp11/date_time.h
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2015-2015, Roland Bock
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice, this
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SQLPP_DATE_TIME_H
+#define SQLPP_DATE_TIME_H
+
+#include <sqlpp11/date_time_fwd.h>
+#include <sqlpp11/basic_expression_operators.h>
+#include <sqlpp11/type_traits.h>
+#include <sqlpp11/exception.h>
+#include <sqlpp11/value_type.h>
+#include <sqlpp11/assignment.h>
+#include <sqlpp11/result_field.h>
+
+namespace sqlpp
+{
+  // date_time value type
+  struct date_time
+  {
+    using _traits = make_traits<date_time, tag::is_value_type>;
+    using _tag = tag::is_date_time;
+    using _cpp_value_type = ms_point;
+
+    template <typename T>
+    using _is_valid_operand = is_time_point_t<T>;
+  };
+
+  // date_time parameter value
+  template <>
+  struct parameter_value_t<date_time>
+  {
+    using _value_type = date_time;
+    using _cpp_value_type = typename _value_type::_cpp_value_type;
+
+    parameter_value_t() : _value{}, _is_null(true)
+    {
+    }
+
+    explicit parameter_value_t(const _cpp_value_type& val) : _value(val), _is_null(false)
+    {
+    }
+
+    parameter_value_t& operator=(const _cpp_value_type& val)
+    {
+      _value = val;
+      _is_null = false;
+      return *this;
+    }
+
+    parameter_value_t& operator=(const tvin_t<wrap_operand_t<_cpp_value_type>>& t)
+    {
+      if (t._is_trivial())
+      {
+        _value = day_point{};
+        _is_null = true;
+      }
+      else
+      {
+        _value = t._value._t;
+        _is_null = false;
+      }
+      return *this;
+    }
+
+    void set_null()
+    {
+      _value = day_point{};
+      _is_null = true;
+    }
+
+    bool is_null() const
+    {
+      return _is_null;
+    }
+
+    const _cpp_value_type& value() const
+    {
+      return _value;
+    }
+
+    operator _cpp_value_type() const
+    {
+      return _value;
+    }
+
+    template <typename Target>
+    void _bind(Target& target, size_t index) const
+    {
+      target._bind_date_parameter(index, &_value, _is_null);
+    }
+
+  private:
+    _cpp_value_type _value;
+    bool _is_null;
+  };
+
+  // date_time expression operators
+  template <typename Base>
+  struct expression_operators<Base, date_time> : public basic_expression_operators<Base, date_time>
+  {
+    template <typename T>
+    using _is_valid_operand = is_valid_operand<date_time, T>;
+  };
+
+  // date_time column operators
+  template <typename Base>
+  struct column_operators<Base, date_time>
+  {
+    template <typename T>
+    using _is_valid_operand = is_valid_operand<date_time, T>;
+  };
+
+  // date_time result field
+  template <typename Db, typename FieldSpec>
+  struct result_field_t<date_time, Db, FieldSpec>
+      : public result_field_methods_t<result_field_t<date_time, Db, FieldSpec>>
+  {
+    static_assert(std::is_same<value_type_of<FieldSpec>, date_time>::value, "field type mismatch");
+    using _cpp_value_type = typename date_time::_cpp_value_type;
+
+    result_field_t() : _is_valid(false), _is_null(true), _value{}
+    {
+    }
+
+    void _invalidate()
+    {
+      _is_valid = false;
+      _is_null = true;
+      _value = day_point{};
+    }
+
+    void _validate()
+    {
+      _is_valid = true;
+    }
+
+    bool is_null() const
+    {
+      if (not _is_valid)
+        throw exception("accessing is_null in non-existing row");
+      return _is_null;
+    }
+
+    bool _is_trivial() const
+    {
+      if (not _is_valid)
+        throw exception("accessing is_null in non-existing row");
+
+      return value() == day_point{};
+    }
+
+    _cpp_value_type value() const
+    {
+      if (not _is_valid)
+        throw exception("accessing value in non-existing row");
+
+      if (_is_null)
+      {
+        if (enforce_null_result_treatment_t<Db>::value and not null_is_trivial_value_t<FieldSpec>::value)
+        {
+          throw exception("accessing value of NULL field");
+        }
+        else
+        {
+          return day_point{};
+        }
+      }
+      return _value;
+    }
+
+    template <typename Target>
+    void _bind(Target& target, size_t i)
+    {
+      target._bind_date_result(i, &_value, &_is_null);
+    }
+
+  private:
+    bool _is_valid;
+    bool _is_null;
+    _cpp_value_type _value;
+  };
+
+  // ostream operator for date_time result field
+  template <typename Db, typename FieldSpec>
+  inline std::ostream& operator<<(std::ostream& os, const result_field_t<date_time, Db, FieldSpec>& e)
+  {
+    return serialize(e, os);
+  }
+}
+#endif
diff --git a/include/sqlpp11/date_fwd.h b/include/sqlpp11/date_time_fwd.h
similarity index 93%
rename from include/sqlpp11/date_fwd.h
rename to include/sqlpp11/date_time_fwd.h
index 7404c297..80c960db 100644
--- a/include/sqlpp11/date_fwd.h
+++ b/include/sqlpp11/date_time_fwd.h
@@ -34,8 +34,10 @@ namespace sqlpp
   using days = std::chrono::duration<int, std::ratio_multiply<std::ratio<24>, std::chrono::hours::period>>;
 
   using day_point = std::chrono::time_point<std::chrono::system_clock, days>;
+  using ms_point = std::chrono::time_point<std::chrono::system_clock, std::chrono::microseconds>;
 
   struct date;
+  struct date_time;
 };
 
 #endif
diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h
index e67904a9..06f1ee40 100644
--- a/include/sqlpp11/type_traits.h
+++ b/include/sqlpp11/type_traits.h
@@ -90,13 +90,17 @@ namespace sqlpp
   SQLPP_VALUE_TRAIT_GENERATOR(is_sql_null)
   SQLPP_VALUE_TRAIT_GENERATOR(is_boolean)
   SQLPP_VALUE_TRAIT_GENERATOR(is_date)
-  SQLPP_VALUE_TRAIT_GENERATOR(is_datetime)
+  SQLPP_VALUE_TRAIT_GENERATOR(is_date_time)
   SQLPP_VALUE_TRAIT_GENERATOR(is_integral)
   SQLPP_VALUE_TRAIT_GENERATOR(is_floating_point)
   template <typename T>
   using is_numeric_t = logic::any_t<detail::is_element_of<tag::is_integral, typename T::_traits::_tags>::value,
                                     detail::is_element_of<tag::is_floating_point, typename T::_traits::_tags>::value>;
 
+  template <typename T>
+  using is_time_point_t = logic::any_t<detail::is_element_of<tag::is_date, typename T::_traits::_tags>::value,
+                                       detail::is_element_of<tag::is_date_time, typename T::_traits::_tags>::value>;
+
   SQLPP_VALUE_TRAIT_GENERATOR(is_text)
   SQLPP_VALUE_TRAIT_GENERATOR(is_wrapped_value)
   SQLPP_VALUE_TRAIT_GENERATOR(is_selectable)
diff --git a/include/sqlpp11/wrap_operand.h b/include/sqlpp11/wrap_operand.h
index 0c3b1720..b829e255 100644
--- a/include/sqlpp11/wrap_operand.h
+++ b/include/sqlpp11/wrap_operand.h
@@ -28,7 +28,7 @@
 #define SQLPP_DETAIL_WRAP_OPERAND_H
 
 #include <string>
-#include <sqlpp11/date_fwd.h>
+#include <sqlpp11/date_time_fwd.h>
 #include <sqlpp11/wrap_operand_fwd.h>
 #include <sqlpp11/serializer.h>
 #include <sqlpp11/type_traits.h>
@@ -71,27 +71,28 @@ namespace sqlpp
     _value_t _t;
   };
 
-  struct date_operand : public alias_operators<date_operand>
+  template <typename Rep, typename Period>
+  struct date_time_operand : public alias_operators<date_time_operand<Rep, Period>>
   {
     using _traits = make_traits<date, tag::is_expression, tag::is_wrapped_value>;
     using _nodes = detail::type_vector<>;
     using _is_aggregate_expression = std::true_type;
 
-    using _value_t = day_point;
+    using _value_t = std::chrono::time_point<Rep, Period>;
 
-    date_operand() : _t{}
+    date_time_operand() : _t{}
     {
     }
 
-    date_operand(_value_t t) : _t(t)
+    date_time_operand(_value_t t) : _t(t)
     {
     }
 
-    date_operand(const date_operand&) = default;
-    date_operand(date_operand&&) = default;
-    date_operand& operator=(const date_operand&) = default;
-    date_operand& operator=(date_operand&&) = default;
-    ~date_operand() = default;
+    date_time_operand(const date_time_operand&) = default;
+    date_time_operand(date_time_operand&&) = default;
+    date_time_operand& operator=(const date_time_operand&) = default;
+    date_time_operand& operator=(date_time_operand&&) = default;
+    ~date_time_operand() = default;
 
     bool _is_trivial() const
     {
@@ -255,10 +256,10 @@ namespace sqlpp
     using type = boolean_operand;
   };
 
-  template <>
-  struct wrap_operand<day_point, void>
+  template <typename Rep, typename Period>
+  struct wrap_operand<std::chrono::time_point<Rep, Period>, void>
   {
-    using type = date_operand;
+    using type = date_time_operand<Rep, Period>;
   };
 
   template <typename T>