Adjust transport to make better use of $q api