Why are you using a Map ? I'll just do a Set with the current roles