Changes to remove instanciation and copying of match policy object