Adding Time Stamp optional feature