Added support for filters!