Jhbate/uploader

changes required for jellyfish and uploader changes