Moved code from proxy to uploaders.