Improved the Verify API a bit and made both types of Verify more consistent