RA-144: add more id attributes
RA-144: better id's
Merge pull request #2 from LeeBreisacher/RA-144-id-attributes

RA-144: add more id attributes