Added potential for supporting multiple transport types