#57 - Add persistance