Moved creation of new filters into a FilterFactory