Broaden NA handling