Fix connectionId and add ucat