Refactor roles part : Add decorators