Refactor roles