Added TimeStampHandler