More role stuff. Refactoring is needed