Initial changes for implementing the CheckUnmatchedFieldsHandler