Adding support for mutliple transport types and unknown transport type