Add logic to handle elastic IP