Add bench test, Better transport system