US6006: Updating role mapping feature