Add support for raw filter