Use roleId instead of the String PI