Role values handling refactoring