Support for masks. Also improved support for filters.