Add id_message, use instead of timestamps