Improve DurationConverter