Improved the match structure.