Added environment groups