Persistency better arranged