Updated FileWrapper Class