Add optional support for Joda-Time