Small interface change, cleaned up filter class