improve transport architecture