Improve persistency layer