Additional groups support, fixes #7