Added support for a duration of none