[#74415224] Added some OO classes for filtering