Updated to add env variable