Cooperate with PersistanceManager

May contain traces of bugs