greatly improved not_supported tracking from a performance standpoint