Moved transit on to wrapper-base