Add uploaders
merge