Added some enhancements to Verification