Added availability_zone and related tables