Add complete impl for Uploader