Made the persistence functionality working again.