US #20: Improve file uploading