Add initial TimeSpan support