Added environment controller