Added trap to timestamp commands