Add back support for multiple ROLEs