Added a timestamp option