Move verification to context factory