More comprehensive save/retrieval