Added environment variables