Renamed has_avu to contains_avu