Changes for setting environment variables for job execution