Add back the timestamp creation