Added include_timestamp option.