make transport more relisant to unconsitent API