adding elb support