Port-mapping changes to support 7.1.0 models