Improve save/load models to/from files