enhancements in verification handling