Add id and timestamp