Added new support for ELB and deletion