In one embodiment the present invention includes a computer-implemented method of improving performance of schema matching. The method includes storing a matching topology that maps a first data structure to a second data structure. The method further includes identifying a first portion of the matching topology that is a candidate for improvement as determined according to an incidence graph. The method further includes rewriting the first portion of the matching topology with a second portion according to the incidence graph.