Added support for arbitrary(ish) file uploads