More refactoring into roles