Added TimeSpan support