Added environment variable configuration