Implement proper duration calculation