Use a more robust persistence scheme, thanks spolu and szawcz