Modified Storage to handle multiple files.