Update for Duration API (yay!)