Adding some persistance