Updated upload manager