Improve Blob/File management