Added support for ELB URLs