Added option to override timestamps.