Update to have environment variables