Replace 'duration' calculation with default method