Improved and documented transport selection