More role refactoring...