Add support for custom filter handling