Add support for ContentFilter