Add joda-time dependency. fix comparators to generics