Compatibility with Persistent 2.0