Added code for the OUU matching. Also code for new perfect-xCM3 definition