Added Support for Filters