XNIO-150 Add a map and set type for matching - Implementation improvements
XNIO-150 Add a map and set type for matching - Implementation improvements