Further separating transport and adapters