Add id and version