Improve structure for simple and multiple matching