Improve control over upload