Group support. Helpers for getting users and groups. Extended guard for checking for group. Other minor changes.