Refactor role management — Separating mailout role code from general role code