Reworking file upload