As I said in Rome, that is actually what I am working on at the moment - adding criteria support in 6. See the Zulip discussions if you'd like to keep up or help