minor refactoring
add roles to users