Channel/transport updates - WIP