Refactor Verify plugin command. Fix #508