Adding data persistence option