Make some methods private, add reference copy of uploader utility.