Updated with environment configuration