Refine verify procedure