Implement better handling of multipart forms