Add option for timestamp