Added format envs and groupings back