add availability_zone support
add availability_zone support