Better persistency gestion