added support for joda time