added timestamp support