Refactored VerificationService to be more general