Add filtering support to utils