Updated upload tool