Updated FileHandling Functionality