Added time handling with Joda Time