XNIO-150 Add a map and set type for matching - Changes to be suitable for both IPV4 and IPV6