Refactoring

Role refactoring