add availability_zone support