Added: ensure_schema_match