Better support for file uploads