Role refactor