Added Joda time to the mix