Allow storage path to be specified/overidden