Better modularity for filter