Added saving to yaml