XNIO-150 Add a map and set type for matching - Fixing comments