Added support for durations