Added support for transport mappings

Code is loosely based on Frank Breedijk his work.