RA-144: add more id attributes