Match refactor to account for data structures.