Added basic support for save