Adding support for custom filters