Adding support for restricting users to specific groups