Updates to avoid destruction of DB
Now works from the shell