Fix the looping for adding users to groups
Restructure stream role