Implemented timestamp feature