removed WithFilter class, added collect operator