ID updates

9042 - 17461
Merge pull request #11 from tiago3961/patch-11

ID updates