Still to refactor file upload repetitions