Refactored How Roles are Built

- Refactor roles