Convert to use of withFilter instead of extra constructor args