Update logging to support timestamp