change matching to return node mappings