*8094* Modernize role ID