Industry converted to use marshalling