MODIFIED: Various new types to support transports.