Added environment label support