Updates copied from ELB plugin.