Adding persistency layer