Added environment control vars