Add environment variable bypass