Api Change to use TimeSpan