Added upload management