Improve verify mechanism