Refactor save/load into PersistentModel which does it in a smarter way, also fix some package versions