Refactoring: Add verification information