Added ADDR env var.