Updated uploader client code