Improve verification API