storage: improve usability