Added support for source filtering