Renamed and restructured roles