Merge "Refactor update_verifier into a class"