Refactored: schema matching/validation.