added initial timestamp support