Change time operations to joda