Updated to the new transport api