Prepare to move the filters to individual classes