Simplified database save operations

Thanks to previous commit, save operations could be simplified to
minimum.