Persistency improvements.