Update, _init fix
Persistence to be solved separately