Added environment selector