Added support for file format filtering