Refactored roles