Refactoring of roles, requests and grants