Add withFilter to avoid scala 2.10 warnings