[enhancement] Introduced smarter validation