More refactoring of attributes into roles