Change match-schema