Changes for solving persistence (deletion and updating)