Added support for different transport types