Criteria support

Need to:

- Make the PersistentCollection selectable
- Try it
- Test it