Timestamp support

cc #6