[generic] Improve detection