Added functionality to file storage handler