First work towards supporting other Uploaders