Separate upload targets from handler