add timestamp support
timestamp forwarding