Integrate new upload pattern correctly