Added yaml storage option, 0.5.1