Don't need FileWrapper any longer