Adding handling for roles override