Adds support for user groups