Improved file uploader