Allow additional groups to be optional
Update changelog
fix syntax