add timestamp handling