Adding persistance layer