Added TimeSpan
Added transition context helper