NXP-15864 Allow to contribute a wrapper to have custom filtering without having to override the while set of classes