Add verification target
Refactor