Updates to supported_groups following review feedback