Smaller changes for implementing filters