Added environment configuration