Improved match definition.