Added support for Save, tests and docs