I think if we're adding the ability to override DEFAULT_RATE_UNIT, we should do the same for DEFAULT_DURATION_UNIT, otherwise, I'm +1 on this change.