[MOD] Prework to implement the filterer