Work towards current transport compatibility