add filtering capatibility