Model verifiers refactor to prevent class duplication and easier additions