Added withFilterFn, still need to update docs