add timestamp support