Storage_info returns vector of files

Also, lot of ugly workarounds