Added time stamp feature