More changes to Duration