Refactor verification routines
More migration to masterapi