Custom uploader changes