Add group selection for environments
Add Group selection for mockGroups