Updated FileManager class