adding duration support