added advanced timestamp hadling
