Environment configuration improved