Handled duplicate files upload and other edge cases