Changes for Persistent 2