Added a filter class