Updating the upload class after a few fixes with @xLink