Allow forced upload; Use unified manager