#364 Improve Joda time handling