Refactoring of role management section.