Made filters into first class objects