#2 Additional units support for matches mappers